Merge branch 'boe_develop' into 'develop'

Boe develop

See merge request !97

src/App.vue

@@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
 
 const store = useStore();
 const isLogin = ref(false);
-console.log("版本2.1.8------------");
+console.log("版本2.1.9------------");
 
 // 监听关闭浏览器
 let time1 = ref(0);

src/components/common/BaseTable.vue

@@ -12,8 +12,9 @@
   />
 </template>
 <script setup>
-import {defineProps, defineExpose, ref, computed, onMounted, defineEmits} from "vue";
+import {defineProps, defineExpose, ref, computed, onMounted, defineEmits, nextTick} from "vue";
 import {useRowsPageNoInit} from "@/api/request";
+import {useResetRef} from "@/utils/useCommon";
 
 const props = defineProps({
   type: {
@@ -44,10 +45,10 @@ const props = defineProps({
 const emit = defineEmits(["update:params", "update:selectedRowKeys", "update:selectedRows"]);
 const rowSelectKeys = ref([]);
 const selectsData = ref([]);
-const params = ref({ pageNo: 1, pageSize: 10 });
+const params = useResetRef({ pageNo: 1, pageSize: 10 });
 const postParam = computed(() => ({ ...params.value, ...props.params }));
 
-const { data, loading, total, fetch } = props.request(props.url, postParam);
+const { data, loading, total, fetch: onFetch } = props.request(props.url, postParam);
 
 const rowSelection = computed(() => (props.type ? {
   type: props.type,
@@ -76,6 +77,8 @@ const customRow = (record) => ({
   }
 });
 
+onMounted(() => props.init && nextTick(onFetch));
+
 function onSelectChange(e, l) {
   rowSelectKeys.value = e;
   selectsData.value = l;
@@ -92,14 +95,13 @@ const pagination = computed(() => ({
 }));
 const changePagination = (e) => {
   params.value.pageNo = e;
-  fetch();
+  onFetch();
 };
-onMounted(() => props.init && fetch());
 
 function reset(v = {}) {
-  params.value = { pageNo: 1, pageSize: 10, ...v };
+  params.reset();
   emit("update:params", { ...v });
-  fetch();
+  nextTick(onFetch);
 }
 
 function resetSelected() {
@@ -109,18 +111,16 @@ function resetSelected() {
   emit("update:selectedRows", []);
 }
 
-function clear() {
+function clear(v = {}) {
   rowSelectKeys.value = [];
   selectsData.value = [];
-  params.value = { pageNo: 1, pageSize: 10 };
+  params.reset();
-  emit("update:params", {});
+  emit("update:params", { ...v });
   emit("update:selectedRowKeys", []);
   emit("update:selectedRows", []);
 }
 
-function toLoading() {
+const toLoading = () => loading.value = true;
-  loading.value = true;
-}
 
 function remove(i) {
   rowSelectKeys.value.splice(i, 1);
@@ -129,6 +129,8 @@ function remove(i) {
   emit("update:selectedRows", selectsData.value);
 }
 
+const fetch = () => nextTick(onFetch);
+
 defineExpose({ fetch, reset, resetSelected, clear, toLoading, remove });
 
 </script>

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 }) => {

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.reset()
-  params.value.keyWord = "";
-  params.value.authorName = "";
   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);

src/components/drawers/AddDiscuss.vue

@@ -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: ''})
 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() {

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) => {

src/components/drawers/AddFaceClass.vue

@@ -28,13 +28,14 @@
 import {defineEmits, defineProps, ref} from "vue";
 import {Form, message} from "ant-design-vue";
 import FaceClassAll from "@/components/drawers/FeaceClassAll.vue";
+import {useResetRef} from "@/utils/useCommon";
 
 const props = defineProps({
   type: Number,
   taskList: []
 });
 const visible = ref(false);
-const formData = ref({
+const formData = useResetRef({
   courseId: "",
   courseName: "",
 });
@@ -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() {

src/components/drawers/AddHomework.vue

@@ -90,69 +90,93 @@
 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 visible = ref(false);
-const formData = ref({})
+const formData = useResetRef({ workName: "", submitStartTime: "", submitEndTime: "", workRequirement: "" });
-const emit = defineEmits({})
+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
+  visible.value = false;
-  taskIndex.value = -1
+  taskIndex.value = -1;
-  formData.value = {}
+  formData.reset();
-  dateTime.value = []
+  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.submitStartTime = timeStr[0];
-  formData.value.submitEndTime = timeStr[1]
+  formData.value.submitEndTime = timeStr[1];
 }
 
 const disabledDate = (current) => {
-  return current && current < dayjs().startOf('day');
+  return current && current < dayjs().startOf("day");
 };
-/**
+
-const disabledRangeTime = () => ({
+async function confirm() {
-  disabledHours: () => range(0, 24).splice(4, 20),
+  await validate().catch(({ errorFields }) => {
-  disabledMinutes: () => range(30, 60),
+    message.warning(errorFields[0].errors.join());
-  disabledSeconds: () => [55, 56],
+    throw Error("数据校验不通过");
   });
- */
-function confirm() {
   if (taskIndex.value === -1) {
-    const list = props.taskList
+    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}})
+    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]
+    const data = props.taskList[taskIndex.value];
-    data.name = formData.value.workName
+    data.name = formData.value.workName;
-    data.info = {...formData.value}
+    data.info = { ...formData.value };
-    data.duration = dayjs(formData.value.submitEndTime).diff(formData.value.submitStartTime,'minutes')
+    data.duration = dayjs(formData.value.submitEndTime).diff(formData.value.submitStartTime, "minutes");
   }
-  emit('update:taskList', [...props.taskList])
+  emit("update:taskList", [...props.taskList]);
-  closeDrawer()
+  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 {

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() {

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("确定按钮:");

src/components/drawers/AddOpenCourse.vue

@@ -62,7 +62,7 @@
         </div>
         <div class="main_table">
           <div class="drawerbox">
-            <BaseTable ref="tableRef" :url="COURSE_PLAN_PAGE" :params="params" :columns="columns"/>
+            <BaseTable ref="tableRef" :url="COURSE_PLAN_PAGE" v-model:params="params" :columns="columns"/>
           </div>
         </div>
       </div>
@@ -341,7 +341,7 @@
   </a-drawer>
 </template>
 <script setup>
-import {defineProps, ref} from "vue";
+import {defineProps, ref, nextTick} from "vue";
 import {Form, message} from "ant-design-vue";
 import FJUpload from "@/components/common/FJUpload";
 import CheckBox from "@/components/common/CheckBox";
@@ -356,6 +356,7 @@ import dayjs from "dayjs";
 import BaseTable from "@/components/common/BaseTable";
 import {request} from "@/api/request";
 import dialog from "@/utils/dialog";
+import {useResetRef} from "@/utils/useCommon";
 
 const props = defineProps({
   type: Number,
@@ -433,7 +434,7 @@ const validated = ref(0);
 const dateTime = ref([]);
 const courseName = ref();
 
-const formData = ref({
+const formData = useResetRef({
   name: "",
   address: "",
   teacherId: "",
@@ -486,7 +487,7 @@ const formDataRule = {
     },
   ],
 };
-const { resetFields, validate } = Form.useForm(formData, formDataRule);
+const { validate } = Form.useForm(formData, formDataRule);
 
 function timeChange(time, timeStr) {
   formData.value.beginTime = timeStr[0];
@@ -498,12 +499,20 @@ function search() {
 }
 
 function reset() {
-  tableRef.value.reset();
+  tableRef.value.reset({
+    type: props.type,
+    offcourseId: params.value.offcourseId,
+    draftTaskId: params.value.draftTaskId,
+  });
 }
 
 const closeDrawer = () => {
   openCourseVisible.value = false;
-  tableRef.value.reset();
+  tableRef.value.reset({
+    type: props.type,
+    offcourseId: params.value.offcourseId,
+    draftTaskId: params.value.draftTaskId,
+  });
 };
 
 function confirm() {
@@ -511,8 +520,7 @@ function confirm() {
 }
 
 const createNewCourse = () => {
-  resetFields({
+  formData.reset({
-    id: null,
     type: props.type,
     offcourseId: params.value.offcourseId,
     draftTaskId: params.value.draftTaskId,
@@ -552,7 +560,7 @@ function planEdit(record) {
   validated.value = 0;
   formData.value.homeWorkId && request(WORK_DETAIL(formData.value.homeWorkId), {}).then(res => formData.value.workInfo = res.data);
   formData.value.testId && request(EXAM_DETAIL(formData.value.testId), {}).then(res => formData.value.examInfo = res.data);
-  dateTime.value=[formData.value.beginTime,formData.value.endTime]
+  dateTime.value = [formData.value.beginTime, formData.value.endTime];
   offCourseNewVisiable.value = true;
 }
 
@@ -563,7 +571,7 @@ function openDrawer(row) {
   formData.value.offcourseId = row.courseId;
   formData.value.draftTaskId = row.id;
   courseName.value = row.name;
-  tableRef.value && tableRef.value.fetch();
+  nextTick(tableRef.value.fetch);
 }
 
 const disabledDate = (current) => current && current < dayjs().startOf("day");

src/components/drawers/AddRef.vue

@@ -83,66 +83,67 @@
 </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 visible = ref(false);
-const formData = ref({linkName: '', linkAddress: '', linkDescription: ''})
+const formData = useResetRef({ linkName: "", linkAddress: "", linkDescription: "" });
-const emit = defineEmits({})
+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
+  visible.value = false;
-  taskIndex.value = -1
+  taskIndex.value = -1;
-  dateTime.value = []
+  dateTime.value = [];
-  resetFields()
+  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
+    const list = props.taskList;
-    list.push({name: formData.value.linkName, type: props.type, info: {...formData.value}})
+    list.push({ name: formData.value.linkName, type: props.type, info: { ...formData.value } });
   } else {
-    const data = props.taskList[taskIndex.value]
+    const data = props.taskList[taskIndex.value];
-    data.name = formData.value.linkName
+    data.name = formData.value.linkName;
-    data.info = {...formData.value}
+    data.info = { ...formData.value };
   }
-  emit('update:taskList', [...props.taskList])
+  emit("update:taskList", [...props.taskList]);
-  closeDrawer()
+  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 {
@@ -261,7 +262,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 +280,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;

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.reset()
-  formData.value.examinationExplain = ''
-  resetFields()
   dateTime.value = []
 };
 

src/components/drawers/FeaceClassAll.vue

@@ -2,10 +2,16 @@
 <template>
     <div class="main_item">
       <div class="fi_input">
+        <a-input
+          v-model:value="params.offcourseNumber"
+          style="width: 220px; height: 40px; border-radius: 8px;margin-right: 32px;"
+          placeholder="请输入课程编号"
+          maxlength="20"
+        />
         <a-input
           v-model:value="params.courseName"
           style="width: 220px; height: 40px; border-radius: 8px;margin-right: 32px;"
-          placeholder="请输入课程名称/编号"
+          placeholder="请输入课程名称"
           maxlength="20"
         />
         <a-tree-select
@@ -67,7 +73,7 @@
   </template>
   <script setup>
   import { computed, defineEmits, defineProps, ref, watch } from "vue";
-  import { courseListView } from "../../api/indexAudit";
+  import { list } from "@/api/indexCourse";
   import CourseModal from "../../views/courselibrary/courseModal.vue";
   import {useStore} from "vuex";
 
@@ -82,8 +88,8 @@
   const columns = ref([
     {
       title: "课程编号",
-      dataIndex: "id",
+      dataIndex: "offcourseNumber",
-      key: "id",
+      key: "offcourseNumber",
       width: "40%",
       ellipsis: true,
     },
@@ -126,6 +132,7 @@
   ]);
   const initParams = {
     courseName: "",
+    offcourseNumber: "",
     pageNo: 1,
     pageSize: 10,
     releaseStatus: 2,
@@ -155,14 +162,15 @@
   const getList = () => {
     loading.value = true
     let objn = {
-        auditStatus: 0,
+        auditStatus: 2,
         sysTypeId: valueproj.value,
+        offcourseNumber: params.value.offcourseNumber,
         name: params.value.courseName,
         pageNo: params.value.pageNo,
         pageSize: 10,
     };
     console.log(objn);
-    courseListView(objn)
+    list(objn)
       .then((res) => {
           console.log("获取已审核课程成功", res.data.data);
           data.value = res.data.data.rows;
@@ -252,6 +260,7 @@
     params.value.pageIndex = 1;
     params.value.keyWord = "";
     params.value.courseName = "";
+    params.value.offcourseNumber = "";
     valueproj.value = null;
     getList();
   }

src/components/student/OnlineClassModelStudent.vue

@@ -77,6 +77,13 @@
             </a-button>
           </CommonStudent>
         </a-col>
+        <a-col>
+          <a-button class="cus-btn" style="background: #4ea6ff; color: #fff; width: 100px" @click="exportStu(record.id)">
+            <template #icon><img style="margin-right: 10px" src="../../assets/images/courseManage/search0.png"/>
+            </template>
+            导出
+          </a-button>
+        </a-col>
       </a-row>
       <div style="margin-top: 20px">
         <a-table
@@ -307,6 +314,10 @@ watch(visiable, () => {
   searchParams.value = initParams;
 });
 
+function exportStu(){
+  window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudent?type=3&&thirdType=8&pid=${props.id}`);
+}
+
 defineExpose({
   searchStu,
   loading,

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) {

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);

src/views/courselibrary/CoursewareManage.vue

@@ -335,7 +335,7 @@
               >提交审核
             </a-button>
             <a-button
-              v-if="(record.auditStatus === 2 || record.auditStatus === 3) && !record.publishStatus && checkPer(record.permissions,createId)"
+              v-if="(record.auditStatus === -1 || record.auditStatus === 2 || record.auditStatus === 3) && !record.publishStatus && checkPer(record.permissions,createId)"
               @click="() => handleEdit(record, String(record.courseform))"
               type="link"
               >编辑
@@ -388,7 +388,7 @@
               >
               <a-button
                 v-if="
-                  (record.auditStatus === 2 || record.publishStatus) &&
+                  (record.auditStatus === 1 || record.auditStatus === 2 || record.publishStatus) &&
                   record.status &&
                   checkPer(record.permissions,createId)
                 "
@@ -2593,7 +2593,7 @@ export default defineComponent({
       validated: 0,
       attach: "",
       pageSize2: 10,
-      currentPage2: 0,
+      currentPage2: 1,
       tableDataTotal2: 0,
       pageSize22: 10,
       currentPage22: 1,
@@ -3341,7 +3341,7 @@ export default defineComponent({
     // state.tableData2 = datas;
     // };
     // 渲染开课操作
-    const getTableDate3 = async () => {
+    const getTableDate3 = async (type) => {
       state.tableLoading = true;
       // let datas = state.tableData6;
       let beginTime = "";
@@ -3361,7 +3361,7 @@ export default defineComponent({
         // );
       }
       let obj = {
-        pageNo: state.currentPage222,
+        pageNo: type?state.currentPage2:state.currentPage222,
         pageSize: state.pageSize222,
         createName: state.kk_inputV1,
         teacher: state.kk_inputV2,
@@ -3375,6 +3375,7 @@ export default defineComponent({
       console.log("开课res", res);
       const { rows, total, pageNo } = res.data.data;
       state.tableDataTotal222 = total;
+      state.tableDataTotal2 = total; 
 
       for (let i = 0; i < rows.length; i++) {
         rows[i].num = i + 1 + (state.currentPage222 - 1) * 10;
@@ -4549,7 +4550,7 @@ export default defineComponent({
       state.offcourseId = item.id;
       state.newCourseName = item.name;
       state.permissions = item.permissions;
-      getTableDate3();
+      getTableDate3(1);
       state.stm_hs = true;
     };
 
@@ -4566,7 +4567,7 @@ export default defineComponent({
     const handelChangePage2 = (page, pageSize) => {
       state.currentPage2 = page;
       state.pageSize2 = pageSize;
-      getTableDate3();
+      getTableDate3(1);
     };
     const handleSearchTable = () => {
       console.log("handleSearchTable");
@@ -4580,6 +4581,8 @@ export default defineComponent({
       state.kk_inputV1 = "";
       state.kk_inputV2 = "";
       state.selectTime = "";
+      state.currentPage2 = 1;
+      state.tableDataTotal2 = [];
       getTableDate();
       getTableDate3();
     };
@@ -5039,6 +5042,10 @@ export default defineComponent({
 });
 </script>
 <style lang="scss">
+.ant-table-cell-fix-right {
+  width: 250px !important;
+}
+
 .addTimeBox {
   position: relative;
   display: flex;

src/views/courselibrary/courseModal.vue

@@ -199,6 +199,9 @@
                     </div>
                     <div style="margin-top: 10px">
                       <a-select
+                        :getPopupContainer="
+                          (triggerNode) => triggerNode.parentNode || document.body
+                        "
                         v-model:value="selectJobId"
                         mode="multiple"
                         style="width: 440px; min-height: 40px"
@@ -214,6 +217,9 @@
                     </div>
                     <div style="margin-top: 10px">
                       <a-select
+                        :getPopupContainer="
+                          (triggerNode) => triggerNode.parentNode || document.body
+                        "
                         v-model:value="selectBandId"
                         mode="multiple"
                         style="width: 440px; min-height: 40px"

src/views/learningpath/LearningPath.vue

@@ -1617,6 +1617,10 @@ export default {
 };
 </script>
 <style lang="scss">
+.ant-table-cell-fix-right {
+  width: 250px !important;
+}
+
 .clearfix:before,
 .clearfix:after {
   content: " ";

src/views/projectcenter/ProjectManage.vue

@@ -1802,6 +1802,10 @@ export default {
 };
 </script>
 <style lang="scss">
+.ant-table-cell-fix-right {
+  width: 300px !important;
+}
+
 .projectManage {
   width: 100%;
   height: 100%;