Merge remote-tracking branch 'origin/develop' into develop

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/RangePicker.vue

@@ -3,6 +3,7 @@
     <div class="select addTimeBox">
       <div class="addTime">创建时间：</div>
       <a-range-picker
+        :value="dateTime"
         style="width: 420px"
         format="YYYY-MM-DD"
         valueFormat="YYYY-MM-DD"
@@ -14,14 +15,29 @@
   </div>
 </template>
 <script setup>
-import {defineEmits} from "vue";
+import {defineEmits,ref} from "vue";
 
 const emit = defineEmits(["update:beginTime", "update:endTime"]);
 
+const dateTime = ref([null,null]);
+
+const resetTime = () => {
+  dateTime.value = [null,null]
+  emit("update:beginTime", null);
+  emit("update:endTime", null);
+}
+
 function change(e) {
+  console.log(e)
+  dateTime.value = [e[0],e[1]]
   emit("update:beginTime", e[0]);
   emit("update:endTime", e[1]);
 }
+
+//暴露resetTime方法
+defineExpose({
+  resetTime
+});
 </script>
 <style  lang="scss">
 .addTimeBox {

src/components/drawers/AddActive.vue

@@ -247,6 +247,11 @@ defineExpose({ openDrawer })
   background-color: #fafafa !important;
 }
 
+.addactiveDrawer > .ant-drawer-content-wrapper {
+    min-width: 800px !important;
+    width: 800px !important;
+}
+
 .addactiveDrawer {
   .drawerMain {
     .header {

src/components/drawers/AddEval.vue

@@ -239,6 +239,11 @@ defineExpose({ openDrawer });
   background-color: #fafafa !important;
 }
 
+.addevalDrawer > .ant-drawer-content-wrapper {
+    min-width: 800px !important;
+    width: 800px !important;
+}
+
 .addevalDrawer {
   .drawerMain {
     .header {

src/components/drawers/AddHomework.vue

@@ -183,6 +183,11 @@ defineExpose({ openDrawer });
   background-color: #fafafa !important;
 }
 
+.addhomeworkDrawer > .ant-drawer-content-wrapper {
+    min-width: 800px !important;
+    width: 800px !important;
+}
+
 .addhomeworkDrawer {
   .drawerMain {
     .header {

src/components/drawers/AddLive.vue

@@ -419,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;
 }

src/components/drawers/AddOpenCourse.vue

@@ -42,10 +42,10 @@
             <div class="mii_ipt">
               <div class="ipt_name"></div>
               <div class="fi_input">
-                <RangePicker v-model:beginTime="params.createBeginTime" v-model:endTime="params.createEndTime"/>
+                <RangePicker ref="resetTime" v-model:beginTime="params.createBeginTime" v-model:endTime="params.createEndTime"/>
               </div>
             </div>
-          </div>
+          </div> 
           <div class="mi_btns" style="margin-left: 0">
             <div class="btn btn2" @click="search">
               <div class="search"></div>
@@ -319,7 +319,7 @@
               <span style="margin-right: 3px"></span>
             </div>
             <div class="b_input">
-              <FJUpload v-model:value="formData.attachName"/>
+              <FJUpload v-model:value="formData.attach"  @changevalue="changevalue"/>
             </div>
           </div>
 
@@ -428,7 +428,9 @@ const params = ref({
   type: props.type,
   offcourseId: "",
   draftTaskId: "",
-  taskId: ""
+  taskId: "",
+  createBeginTime: '', 
+  createEndTime: '', 
 });
 const validated = ref(0);
 const dateTime = ref([]);
@@ -449,7 +451,7 @@ const formData = useResetRef({
   assessmentId: "",
   workInfo: {},
   examInfo: {},
-  attachName: "",
+  attach: "",
   type: props.type,
   offcourseId: "",
   draftTaskId: "",
@@ -498,12 +500,14 @@ function search() {
   tableRef.value.fetch();
 }
 
+const resetTime = ref();
 function reset() {
   tableRef.value.reset({
     type: props.type,
     offcourseId: params.value.offcourseId,
     draftTaskId: params.value.draftTaskId,
   });
+  resetTime.value.resetTime();
 }
 
 const closeDrawer = () => {
@@ -576,6 +580,23 @@ function openDrawer(row) {
 
 const disabledDate = (current) => current && current < dayjs().startOf("day");
 
+// 删除文件返回参数
+const changevalue = (e) => {
+  let arr = formData.value.attach.split(",");
+  let newarr = [];
+  for (let i = 0; i < arr.length; i++) {
+    if (i !== e) {
+      newarr.push(arr[i]);
+    }
+  }
+  if (newarr.length == 0) {
+    formData.value.attach = "";
+  } else {
+    formData.value.attach = newarr.toString();
+  }
+  console.log("changevalue", e, newarr, formData.value.attach);
+}
+
 defineExpose({ openDrawer });
 </script>
 <style lang="scss">

src/components/drawers/AddRef.vue

@@ -150,6 +150,11 @@ defineExpose({ openDrawer });
   background-color: #fafafa !important;
 }
 
+.addrefDrawer > .ant-drawer-content-wrapper {
+    min-width: 800px !important;
+    width: 800px !important;
+}
+
 .addrefDrawer {
   .drawerMain {
     .header {

src/components/drawers/AddTest.vue

@@ -396,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;

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
@@ -126,6 +132,7 @@
   ]);
   const initParams = {
     courseName: "",
+    offcourseNumber: "",
     pageNo: 1,
     pageSize: 10,
     releaseStatus: 2,
@@ -157,6 +164,7 @@
     let objn = {
         auditStatus: 2,
         sysTypeId: valueproj.value,
+        offcourseNumber: params.value.offcourseNumber,
         name: params.value.courseName,
         pageNo: params.value.pageNo,
         pageSize: 10,
@@ -252,6 +260,7 @@
     params.value.pageIndex = 1;
     params.value.keyWord = "";
     params.value.courseName = "";
+    params.value.offcourseNumber = "";
     valueproj.value = null;
     getList();
   }

src/components/drawers/project/ProjectFaceTaskManage.vue

@@ -348,8 +348,10 @@ function exportTaskStu() {
 
 const hasten = () => {
   message.success("催促成功");
+  console.log(data.value[coursePlanIndex.value])
   batchSendMessage({
-    courseId: props.datasource.courseId,//任务的Id
+    // courseId: props.datasource.courseId,//任务的Id
+    courseId: data.value[coursePlanIndex.value].id,//任务的Id
     courseName: props.datasource.name,//任务的名称
     logo: props.type,//项目或径的标识 1-项目 2-路径图 3面授课
     targetId: infoId.value,//路径图的就是routerId,项目的是projectId;根据这张图来看的话

src/components/vote/AddVote.vue

@@ -208,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;

src/views/courselibrary/CoursewareManage.vue

@@ -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();
     };