--fix 任务bug

2025-12-16 14:26:45 +08:00 · 2023-03-28 19:46:58 +08:00
parent e2ccd9b2a5
commit 2d1ca81368
13 changed files with 346 additions and 294 deletions
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -136,13 +136,14 @@
 import { defineEmits, defineProps, ref } from "vue";
 import { Form, message } from "ant-design-vue";
 import dayjs from "dayjs";
+import {useResetRef} from "@/utils/useCommon";

 const props = defineProps({
  type: Number,
  taskList: []
 })
 const visible = ref(false)
-const formData = ref({
+const formData = useResetRef({
  activityName: '',
  activityNotice: '',
  activityStartTime: '',
@@ -195,22 +196,14 @@ const rulesRef = ref({
  ],
 });

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

 const closeDrawer = () => {
  visible.value = false
  taskIndex.value = -1
  dateTime.value = []
-  resetFields()
+  formData.reset()
 };
-/** 
-const range = (start, end) => {
-  const result = [];
-  for (let i = start; i < end; i++) {
-    result.push(i);
-  }
-  return result;
-};*/

 function timeChange(time, timeStr) {
  formData.value.activityStartTime = timeStr[0]
@@ -220,14 +213,7 @@ function timeChange(time, timeStr) {
 const disabledDate = (current) => {
  return current && current < dayjs().startOf('day');
 };
-/** 
-const disabledRangeTime = () => ({
-  // disabledHours: () => range(0, 24).splice(4, 20),
-  disabledMinutes: () => range(30, 60),
-  disabledSeconds: () => [55, 56],
-});

-*/
 async function confirm() {
  // debugger
  await validate().catch(({ errorFields }) => {
@@ -261,6 +247,11 @@ defineExpose({ openDrawer })
  background-color: #fafafa !important;
 }

+.addactiveDrawer > .ant-drawer-content-wrapper {
+  min-width: 800px !important;
+  width: 800px !important;
+}
+
 .addactiveDrawer {
  .drawerMain {
    .header {
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -120,6 +120,7 @@ import { computed, defineEmits, defineProps, ref, watch } from "vue";
 import { useBoeApiPage } from "@/api/request";
 import { CASE_PAGE } from "@/api/ThirdApi";
 import { message } from "ant-design-vue";
+import {useResetRef} from "@/utils/useCommon";

 const props = defineProps({
  type: Number,
@@ -144,14 +145,13 @@ const columns = ref([
    align: "center",
  },
 ]);
-const initParams = {
+const params = useResetRef({
  keyWord: "",
  authorName: "",
  pageIndex: 1,
  pageSize: 10,
  orderAsc: true,
-};
-const params = ref(initParams);
+});

 const rowSelectKeys = ref([]);
 const selectsData = ref([]);
@@ -221,9 +221,7 @@ function search() {
 function reset() {
  rowSelectKeys.value = [];
  selectsData.value = [];
-  params.value.pageIndex = 1;
-  params.value.keyWord = "";
-  params.value.authorName = "";
+  params.reset()
  fetch();
 }

@@ -258,7 +256,6 @@ function confirm() {
 }
 let selectedRows = ref(null);
 function openDrawer(i, row) {
-  console.log("iiiiiiiii", i, row);
  row && (rowSelectKeys.value = [row.info]);
  row && (selectsData.value = [{ title: row.name, id: row.courseId }]);
  i >= 0 && (taskIndex.value = i);
@@ -272,7 +269,10 @@ defineExpose({ openDrawer });
 .ant-table-striped :deep(.table-striped) td {
  background-color: #fafafa !important;
 }
-
+.addcaseDrawer > .ant-drawer-content-wrapper {
+  min-width: 1300px !important;
+  width: 1300px !important;
+}
 .addcaseDrawer {
  .drawerMain {
    .header {
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -65,7 +65,7 @@
              <span style="margin-right: 3px">讨论设置：</span>
            </div>
            <div class="btnbox">
-              <a-checkbox v-model:checked="formData.discussSettings">允许评论</a-checkbox>
+              <a-checkbox v-model:checked="formData.discussSettings" @click="discussSettings">允许评论</a-checkbox>
            </div>
          </div>
        </div>
@@ -80,13 +80,14 @@
 <script setup>
 import {defineEmits, defineProps, ref} from "vue";
 import {Form, message} from "ant-design-vue";
+import {useResetRef} from "@/utils/useCommon";

 const props = defineProps({
  type: Number,
  taskList: []
 })
 const visible = ref(false)
-const formData = ref({discussName: '', discussExplain: '', discussSettings: ''})
+const formData = useResetRef({discussName: '', discussExplain: '', discussSettings: true})
 const emit = defineEmits({})
 const taskIndex = ref(-1);
 const dateTime = ref([]);
@@ -105,13 +106,13 @@ const rulesRef = ref({
  ],
 });

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

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

 async function confirm() {
@@ -132,11 +133,17 @@ async function confirm() {
 }

 function openDrawer(i, row) {
+  console.log(i,row)
  row && (formData.value = {...row.info});
  (i >= 0) && (taskIndex.value = i);
+  row && (formData.value.discussSettings = row.info.discussSettings === "false" || row.info.discussSettings === false ? false : true);
  visible.value = true
 }

+const discussSettings = () => {
+  formData.value.discussSettings = !formData.value.discussSettings;
+}
+
 defineExpose({openDrawer})
 </script>
 <style lang="scss">
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -116,13 +116,14 @@ import { defineEmits, defineProps, ref } from "vue";
 import EvList from "./EvList.vue";
 import {Form, message} from "ant-design-vue";
 import dayjs from "dayjs";
+import {useResetRef} from "@/utils/useCommon";

 const props = defineProps({
  type: Number,
  taskList: [],
 });
 const visible = ref(false);
-const formData = ref({
+const formData = useResetRef({
  evaluationName: "",
  evaluationTypeId: "",
  evaluationTypeName: "",
@@ -154,13 +155,13 @@ const rulesRef = ref({
  ],
 });

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

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

 const range = (start, end) => {
@@ -238,6 +239,11 @@ defineExpose({ openDrawer });
  background-color: #fafafa !important;
 }

+.addevalDrawer > .ant-drawer-content-wrapper {
+  min-width: 800px !important;
+  width: 800px !important;
+}
+
 .addevalDrawer {
  .drawerMain {
    .header {
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -90,75 +90,104 @@
 import {defineEmits, defineProps, ref} from "vue";
 import dayjs from "dayjs";
 import FJUpload from "@/components/common/FJUpload";
+import {useResetRef} from "@/utils/useCommon";
+import {Form, message} from "ant-design-vue";

 const props = defineProps({
  type: Number,
  taskList: []
-})
-const visible = ref(false)
-const formData = ref({})
-const emit = defineEmits({})
+});
+const visible = ref(false);
+const formData = useResetRef({ workName: "", submitStartTime: "", submitEndTime: "", workRequirement: "" });
+const emit = defineEmits({});
 const taskIndex = ref(-1);
 const dateTime = ref([]);
+const rulesRef = ref({
+  workName: [
+    {
+      required: true,
+      message: "请输入作业名称",
+    },
+  ],
+  submitStartTime: [
+    {
+      required: true,
+      message: "请选择开始时间",
+    },
+  ],
+  submitEndTime: [
+    {
+      required: true,
+      message: "请选择结束时间",
+    },
+  ],
+  workRequirement: [
+    {
+      required: true,
+      message: "请输入作业要求",
+    },
+  ],
+});

+const { validate } = Form.useForm(formData, rulesRef);
 const closeDrawer = () => {
-  visible.value = false
-  taskIndex.value = -1
-  formData.value = {}
-  dateTime.value = []
+  visible.value = false;
+  taskIndex.value = -1;
+  formData.reset();
+  dateTime.value = [];
 };
-/**
-const range = (start, end) => {
-  const result = [];
-  for (let i = start; i < end; i++) {
-    result.push(i);
-  }
-  return result;
-};
-*/
+
 function timeChange(time, timeStr) {
-  formData.value.submitStartTime = timeStr[0]
-  formData.value.submitEndTime = timeStr[1]
+  formData.value.submitStartTime = timeStr[0];
+  formData.value.submitEndTime = timeStr[1];
 }

 const disabledDate = (current) => {
-  return current && current < dayjs().startOf('day');
+  return current && current < dayjs().startOf("day");
 };
-/**
-const disabledRangeTime = () => ({
-  disabledHours: () => range(0, 24).splice(4, 20),
-  disabledMinutes: () => range(30, 60),
-  disabledSeconds: () => [55, 56],
+
+async function confirm() {
+  await validate().catch(({ errorFields }) => {
+    message.warning(errorFields[0].errors.join());
+    throw Error("数据校验不通过");
  });
- */
-function confirm() {
  if (taskIndex.value === -1) {
-    const list = props.taskList
-    list.push({name: formData.value.workName,duration:dayjs(formData.value.submitEndTime).diff(formData.value.submitStartTime,'minutes'), type: props.type, info: {...formData.value}})
+    const list = props.taskList;
+    list.push({
+      name: formData.value.workName,
+      duration: dayjs(formData.value.submitEndTime).diff(formData.value.submitStartTime, "minutes"),
+      type: props.type,
+      info: { ...formData.value }
+    });
  } else {
-    const data = props.taskList[taskIndex.value]
-    data.name = formData.value.workName
-    data.info = {...formData.value}
-    data.duration = dayjs(formData.value.submitEndTime).diff(formData.value.submitStartTime,'minutes')
+    const data = props.taskList[taskIndex.value];
+    data.name = formData.value.workName;
+    data.info = { ...formData.value };
+    data.duration = dayjs(formData.value.submitEndTime).diff(formData.value.submitStartTime, "minutes");
  }
-  emit('update:taskList', [...props.taskList])
-  closeDrawer()
+  emit("update:taskList", [...props.taskList]);
+  closeDrawer();
 }

 function openDrawer(i, row) {
  row && (formData.value = { ...row.info });
  row && (dateTime.value = [dayjs(row.info.submitStartTime, "YYYY-MM-DD HH:mm"), dayjs(row.info.submitEndTime, "YYYY-MM-DD HH:mm")]);
  (i >= 0) && (taskIndex.value = i);
-  visible.value = true
+  visible.value = true;
 }

-defineExpose({openDrawer})
+defineExpose({ openDrawer });
 </script>
 <style lang="scss">
 .ant-table-striped :deep(.table-striped) td {
  background-color: #fafafa !important;
 }

+.addhomeworkDrawer > .ant-drawer-content-wrapper {
+  min-width: 800px !important;
+  width: 800px !important;
+}
+
 .addhomeworkDrawer {
  .drawerMain {
    .header {
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -28,13 +28,14 @@
 import {defineEmits, defineProps, ref} from "vue";
 import {Form, message} from "ant-design-vue";
 import AssessmentAll from "@/components/drawers/AssessmentAll.vue";
+import {useResetRef} from "@/utils/useCommon";

 const props = defineProps({
  type: Number,
  taskList: []
 })
 const visible = ref(false)
-const formData = ref({
+const formData = useResetRef({
  assessmentId: '',
  assessmentName: '',
 })
@@ -55,12 +56,12 @@ const rulesRef = ref({
  ],
 });

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

 const closeDrawer = () => {
  visible.value = false
  taskIndex.value = -1
-  resetFields()
+  formData.reset()
 };

 async function confirm() {
@@ -98,7 +99,10 @@ defineExpose({openDrawer})
 .ant-table-striped :deep(.table-striped) td {
  background-color: #fafafa !important;
 }
-
+.addinvistDrawer > .ant-drawer-content-wrapper {
+  min-width: 1300px !important;
+  width: 1300px !important;
+}
 .addinvistDrawer {
  .drawerMain {
    .header {
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -226,6 +226,7 @@ import ProjectManager from "@/components/project/ProjectManagerNew";
 import AddInvistRoot from "@/components/drawers/AddInvistRoot.vue";
 import { Form, message } from "ant-design-vue";
 import { fileUp } from "../../api/indexEval";
+import {useResetRef} from "@/utils/useCommon";

 const removePG = () => {
  formData.value.assessmentId = "";
@@ -242,7 +243,7 @@ const props = defineProps({
  taskList: [],
 });
 const visible = ref(false);
-const formData = ref({
+const formData = useResetRef({
  liveName: "",
  liveLink: "",
  liveStartTime: "",
@@ -325,38 +326,20 @@ const rulesRef = ref({
 const { resetFields, validate } = Form.useForm(formData, rulesRef);

 const closeDrawer = () => {
-  formData.value.liveCover = "";
-  formData.value.livePlaybackLink = "";
  imageUrl.value = "";
  visible.value = false;
  taskIndex.value = -1;
  dateTime.value = [];
+  formData.reset()
  resetFields();
 };
-/** 
-const range = (start, end) => {
-  const result = [];
-  for (let i = start; i < end; i++) {
-    result.push(i);
-  }
-  return result;
-};
-*/
 function timeChange(time, timeStr) {
  formData.value.liveStartTime = timeStr[0];
  formData.value.liveEndTime = timeStr[1];
 }
-
 const disabledDate = (current) => {
  return current && current < dayjs().startOf("day");
 };
-/**
-const disabledRangeTime = () => ({
-  // disabledHours: () => range(0, 24).splice(4, 20),
-  disabledMinutes: () => range(30, 60),
-  disabledSeconds: () => [55, 56],
-});
- */
 async function confirm() {
  // debugger;
  console.log("确定按钮:");
@@ -436,6 +419,11 @@ const beforeUpload = (file) => {
  background-color: #fff !important;
 }

+.addliveDrawer > .ant-drawer-content-wrapper {
+  min-width: 800px !important;
+  width: 800px !important;
+}
+
 .ant-table-striped :deep(.table-striped) td {
  background-color: #fafafa !important;
 }
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -164,7 +164,10 @@ function openDrawer(i, row) {
 defineExpose({ openDrawer, selectCourse });
 </script>
 <style lang="scss">
-
+.addonlineDrawer > .ant-drawer-content-wrapper {
+  min-width: 1300px !important;
+  width: 1300px !important;
+}

 .ant-table-striped :deep(.table-striped) td {
  background-color: #fafafa !important;
--- a/src/components/drawers/AddProject.vue
+++ b/src/components/drawers/AddProject.vue
@@ -397,7 +397,10 @@ defineExpose({ openDrawer });
 .ant-table-striped :deep(.table-striped) td {
  background-color: #fafafa !important;
 }
-
+.addonlineDrawer > .ant-drawer-content-wrapper {
+  min-width: 1300px !important;
+  width: 1300px !important;
+}
 .sameModal {
  .ant-modal {
    width: 424px !important;
--- a/src/components/drawers/AddRef.vue
+++ b/src/components/drawers/AddRef.vue
@@ -83,72 +83,78 @@
 </template>
 <script setup>
 import {defineEmits, defineProps, ref} from "vue";
-import {Form, message} from 'ant-design-vue';
+import {Form, message} from "ant-design-vue";
+import {useResetRef} from "@/utils/useCommon";

 const props = defineProps({
  type: Number,
  taskList: []
-})
-const visible = ref(false)
-const formData = ref({linkName: '', linkAddress: '', linkDescription: ''})
-const emit = defineEmits({})
+});
+const visible = ref(false);
+const formData = useResetRef({ linkName: "", linkAddress: "", linkDescription: "" });
+const emit = defineEmits({});
 const taskIndex = ref(-1);
 const dateTime = ref([]);
 const rulesRef = ref({
  linkName: [
    {
      required: true,
-      message: '请输入链接名称',
+      message: "请输入链接名称",
    },
  ],
  linkAddress: [
    {
-      type: 'url',
+      type: "url",
      required: true,
-      message: '请输入合法的链接地址',
+      message: "请输入合法的链接地址",
    },
  ],
 });

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

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

 async function confirm() {
  await validate().catch(({ errorFields }) => {
    message.warning(errorFields[0].errors.join());
-    throw Error("数据校验不通过")
+    throw Error("数据校验不通过");
  });
  if (taskIndex.value === -1) {
-    const list = props.taskList
-    list.push({name: formData.value.linkName, type: props.type, info: {...formData.value}})
+    const list = props.taskList;
+    list.push({ name: formData.value.linkName, type: props.type, info: { ...formData.value } });
  } else {
-    const data = props.taskList[taskIndex.value]
-    data.name = formData.value.linkName
-    data.info = {...formData.value}
+    const data = props.taskList[taskIndex.value];
+    data.name = formData.value.linkName;
+    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 });
  (i >= 0) && (taskIndex.value = i);
-  visible.value = true
+  visible.value = true;
 }

-defineExpose({openDrawer})
+defineExpose({ openDrawer });
 </script>
 <style lang="scss">
 .ant-table-striped :deep(.table-striped) td {
  background-color: #fafafa !important;
 }

+.addrefDrawer > .ant-drawer-content-wrapper {
+  min-width: 800px !important;
+  width: 800px !important;
+}
+
 .addrefDrawer {
  .drawerMain {
    .header {
@@ -261,7 +267,7 @@ defineExpose({openDrawer})
              background: #4ea6ff;
              border-radius: 8px;
              border: 0;
-              margin-right: 16px 8px 32px 0;
+              margin-right: 16px;
              color: #fff;
              margin-top: 16px;
              margin-bottom: 60px;
@@ -279,7 +285,7 @@ defineExpose({openDrawer})
      display: flex;
      align-items: center;
      justify-content: center;
-      box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+      box-shadow: 0 1px 35px 0 rgba(118, 136, 166, 0.16);

      .btn1 {
        width: 100px;
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -246,6 +246,7 @@ import { defineEmits, defineProps, ref, watch } from "vue";
 import STest from "./SelectTest.vue";
 import dayjs from "dayjs";
 import { Form, message } from "ant-design-vue";
+import {useResetRef} from "@/utils/useCommon";

 const props = defineProps({
  type: Number,
@@ -269,7 +270,7 @@ const initValue = {
  externalExplain: "",
  examinationExplain: ""
 }
-const formData = ref(initValue)
+const formData = useResetRef(initValue)
 const innerRule = {
  examinationName: [
    {
@@ -323,14 +324,12 @@ const outerRule = {
  ],
 }
 const rulesRef = ref(innerRule);
-
 const emit = defineEmits({})
 const taskIndex = ref(-1);
 const dateTime = ref([]);
 let isEdit = ref(true);

 const { resetFields, validate } = Form.useForm(formData, rulesRef);
-
 watch(() => formData.value.examType, () => {
  formData.value.examType === 1 ? rulesRef.value = innerRule : rulesRef.value = outerRule
 })
@@ -338,9 +337,7 @@ watch(() => formData.value.examType, () => {
 const closeDrawer = () => {
  visible.value = false
  taskIndex.value = -1
-  formData.value.examinationLimit = ''
-  formData.value.examinationExplain = ''
-  resetFields()
+  formData.reset()
  dateTime.value = []
 };

@@ -399,6 +396,11 @@ defineExpose({ openDrawer })
  background-color: #fafafa !important;
 }

+.addtestDrawer > .ant-drawer-content-wrapper {
+  min-width: 800px !important;
+  width: 800px !important;
+}
+
 .outer {
  background-color: #4ea6ff;
  color: #fff;
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -113,13 +113,14 @@ import {defineEmits, defineProps, ref} from "vue";
 import CreateVote from "./CreateVote.vue";
 import {Form, message} from "ant-design-vue";
 import dayjs from "dayjs";
+import {useResetRef} from "@/utils/useCommon";

 const props = defineProps({
  type: Number,
  taskList: []
 })
 const visible = ref(false)
-const formData = ref({
+const formData = useResetRef({
  voteName: '',
  voteStartTime: '',
  voteEndTime: '',
@@ -156,13 +157,13 @@ const rulesRef = ref({
  ],
 });

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

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

 function timeChange(time, timeStr) {
@@ -207,6 +208,10 @@ defineExpose({openDrawer})

 </script>
 <style lang="scss">
+.addvoteDrawer > .ant-drawer-content-wrapper {
+  min-width: 800px !important;
+  width: 800px !important;
+}
 .ConfirmModal {
  .ant-modal {
    width: 424px !important;
--- a/src/utils/useCommon.js
+++ b/src/utils/useCommon.js
@@ -19,6 +19,14 @@ export function useInterval(fun, time) {
  return { start };
 }

+export function useResetRef(initValue = {}) {
+  const valueRef = ref({ ...initValue });
+
+  const reset = v => valueRef.value = { ...initValue, ...v };
+
+  return Object.assign(valueRef, { reset });
+}
+
 export function useTimeout(asyncFun, time) {
  const timer = ref();
  const maxCount = ref(0);