From 490d7edbfd1abdf2414b67d5c22936b7b1b609d0 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Mon, 5 Feb 2024 17:53:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                             | 99 ++++++++++++++-----
 package.json                                  |  2 +-
 src/components/OpenPages.vue                  |  1 +
 src/components/drawers/AddOpenCourse.vue      | 54 +++++++---
 .../drawers/router/RouterFaceStu.vue          | 41 +++++---
 src/main.js                                   |  2 +-
 src/views/courselibrary/CoursewareManage.vue  | 29 +++++-
 src/views/projectcenter/TaskPage.vue          | 31 ++++--
 8 files changed, 193 insertions(+), 66 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9ecda927..9936be4d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "dependencies": {
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^5.1.12",
-        "ant-design-vue": "^3.2.12",
+        "ant-design-vue": "^4.1.2",
         "axios": "^1.1.3",
         "babel-eslint": "^10.1.0",
         "core-js": "^3.8.3",
@@ -83,14 +83,14 @@
       }
     },
     "node_modules/@ant-design/icons-svg": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmmirror.com/@ant-design/icons-svg/-/icons-svg-4.2.1.tgz",
-      "integrity": "sha512-EB0iwlKDGpG93hW8f85CTJTs4SvMX7tt5ceupvhALp1IF44SeUFOMhKUOYqpsoYWQKAOuTRDMqn75rEaKDp0Xw=="
+      "version": "4.4.2",
+      "resolved": "https://registry.npmmirror.com/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz",
+      "integrity": "sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA=="
     },
     "node_modules/@ant-design/icons-vue": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmmirror.com/@ant-design/icons-vue/-/icons-vue-6.1.0.tgz",
-      "integrity": "sha512-EX6bYm56V+ZrKN7+3MT/ubDkvJ5rK/O2t380WFRflDcVFgsvl3NLH7Wxeau6R8DbrO5jWR6DSTC3B6gYFp77AA==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmmirror.com/@ant-design/icons-vue/-/icons-vue-7.0.1.tgz",
+      "integrity": "sha512-eCqY2unfZK6Fe02AwFlDHLfoyEFreP6rBwAZMIJ1LugmfMiVgwWDYlp1YsRugaPtICYOabV1iWxXdP12u9U43Q==",
       "dependencies": {
         "@ant-design/colors": "^6.0.0",
         "@ant-design/icons-svg": "^4.2.1"
@@ -1870,6 +1870,16 @@
         "vue": "^3.2.0"
       }
     },
+    "node_modules/@emotion/hash": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmmirror.com/@emotion/hash/-/hash-0.9.1.tgz",
+      "integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ=="
+    },
+    "node_modules/@emotion/unitless": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmmirror.com/@emotion/unitless/-/unitless-0.8.1.tgz",
+      "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ=="
+    },
     "node_modules/@eslint/eslintrc": {
       "version": "0.4.3",
       "resolved": "https://registry.npmmirror.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
@@ -3798,17 +3808,20 @@
       }
     },
     "node_modules/ant-design-vue": {
-      "version": "3.2.20",
-      "resolved": "https://registry.npmmirror.com/ant-design-vue/-/ant-design-vue-3.2.20.tgz",
-      "integrity": "sha512-YWpMfGaGoRastIXEYfCoJiaRiDHk4chqtYhlKQM5GqPt6NfvrM1Vg2e60yHtjxlZjed91wCMm0rAmyUr7Hwzdg==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmmirror.com/ant-design-vue/-/ant-design-vue-4.1.2.tgz",
+      "integrity": "sha512-ynFkDJLlHgumeK6Hr1UZ7PvQNZ1uBcri/pmejBdS3kRqHeA5VRsxneYDwa8YxA+uYB5YfT2jpYsSHsiMiCjRGg==",
       "dependencies": {
         "@ant-design/colors": "^6.0.0",
-        "@ant-design/icons-vue": "^6.1.0",
+        "@ant-design/icons-vue": "^7.0.0",
         "@babel/runtime": "^7.10.5",
-        "@ctrl/tinycolor": "^3.4.0",
+        "@ctrl/tinycolor": "^3.5.0",
+        "@emotion/hash": "^0.9.0",
+        "@emotion/unitless": "^0.8.0",
         "@simonwep/pickr": "~1.8.0",
         "array-tree-filter": "^2.1.0",
         "async-validator": "^4.0.0",
+        "csstype": "^3.1.1",
         "dayjs": "^1.10.5",
         "dom-align": "^1.12.1",
         "dom-scroll-into-view": "^2.0.0",
@@ -3817,6 +3830,8 @@
         "resize-observer-polyfill": "^1.5.1",
         "scroll-into-view-if-needed": "^2.2.25",
         "shallow-equal": "^1.0.0",
+        "stylis": "^4.1.3",
+        "throttle-debounce": "^5.0.0",
         "vue-types": "^3.0.0",
         "warning": "^4.0.0"
       },
@@ -10925,6 +10940,11 @@
         "postcss": "^8.2.15"
       }
     },
+    "node_modules/stylis": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmmirror.com/stylis/-/stylis-4.3.1.tgz",
+      "integrity": "sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ=="
+    },
     "node_modules/supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-5.5.0.tgz",
@@ -11184,6 +11204,14 @@
         "node": ">= 10.13.0"
       }
     },
+    "node_modules/throttle-debounce": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-5.0.0.tgz",
+      "integrity": "sha512-2iQTSgkkc1Zyk0MeVrt/3BvuOXYPl/R8Z0U2xxo9rjwNciaHDG3R+Lm6dh4EeUci49DanvBnuqI6jshoQQRGEg==",
+      "engines": {
+        "node": ">=12.22"
+      }
+    },
     "node_modules/thunky": {
       "version": "1.1.0",
       "resolved": "https://registry.npmmirror.com/thunky/-/thunky-1.1.0.tgz",
@@ -12570,14 +12598,14 @@
       }
     },
     "@ant-design/icons-svg": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmmirror.com/@ant-design/icons-svg/-/icons-svg-4.2.1.tgz",
-      "integrity": "sha512-EB0iwlKDGpG93hW8f85CTJTs4SvMX7tt5ceupvhALp1IF44SeUFOMhKUOYqpsoYWQKAOuTRDMqn75rEaKDp0Xw=="
+      "version": "4.4.2",
+      "resolved": "https://registry.npmmirror.com/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz",
+      "integrity": "sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA=="
     },
     "@ant-design/icons-vue": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmmirror.com/@ant-design/icons-vue/-/icons-vue-6.1.0.tgz",
-      "integrity": "sha512-EX6bYm56V+ZrKN7+3MT/ubDkvJ5rK/O2t380WFRflDcVFgsvl3NLH7Wxeau6R8DbrO5jWR6DSTC3B6gYFp77AA==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmmirror.com/@ant-design/icons-vue/-/icons-vue-7.0.1.tgz",
+      "integrity": "sha512-eCqY2unfZK6Fe02AwFlDHLfoyEFreP6rBwAZMIJ1LugmfMiVgwWDYlp1YsRugaPtICYOabV1iWxXdP12u9U43Q==",
       "requires": {
         "@ant-design/colors": "^6.0.0",
         "@ant-design/icons-svg": "^4.2.1"
@@ -13800,6 +13828,16 @@
       "integrity": "sha512-PSBn3elNoanENc1vnCfh+3WA9fimRC7n+fWkf3rE5jvv+aBohNHABC/KAR5KWPecxWxDTVT1ERpRbOMRcOV/vA==",
       "requires": {}
     },
+    "@emotion/hash": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmmirror.com/@emotion/hash/-/hash-0.9.1.tgz",
+      "integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ=="
+    },
+    "@emotion/unitless": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmmirror.com/@emotion/unitless/-/unitless-0.8.1.tgz",
+      "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ=="
+    },
     "@eslint/eslintrc": {
       "version": "0.4.3",
       "resolved": "https://registry.npmmirror.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
@@ -15394,17 +15432,20 @@
       }
     },
     "ant-design-vue": {
-      "version": "3.2.20",
-      "resolved": "https://registry.npmmirror.com/ant-design-vue/-/ant-design-vue-3.2.20.tgz",
-      "integrity": "sha512-YWpMfGaGoRastIXEYfCoJiaRiDHk4chqtYhlKQM5GqPt6NfvrM1Vg2e60yHtjxlZjed91wCMm0rAmyUr7Hwzdg==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmmirror.com/ant-design-vue/-/ant-design-vue-4.1.2.tgz",
+      "integrity": "sha512-ynFkDJLlHgumeK6Hr1UZ7PvQNZ1uBcri/pmejBdS3kRqHeA5VRsxneYDwa8YxA+uYB5YfT2jpYsSHsiMiCjRGg==",
       "requires": {
         "@ant-design/colors": "^6.0.0",
-        "@ant-design/icons-vue": "^6.1.0",
+        "@ant-design/icons-vue": "^7.0.0",
         "@babel/runtime": "^7.10.5",
-        "@ctrl/tinycolor": "^3.4.0",
+        "@ctrl/tinycolor": "^3.5.0",
+        "@emotion/hash": "^0.9.0",
+        "@emotion/unitless": "^0.8.0",
         "@simonwep/pickr": "~1.8.0",
         "array-tree-filter": "^2.1.0",
         "async-validator": "^4.0.0",
+        "csstype": "^3.1.1",
         "dayjs": "^1.10.5",
         "dom-align": "^1.12.1",
         "dom-scroll-into-view": "^2.0.0",
@@ -15413,6 +15454,8 @@
         "resize-observer-polyfill": "^1.5.1",
         "scroll-into-view-if-needed": "^2.2.25",
         "shallow-equal": "^1.0.0",
+        "stylis": "^4.1.3",
+        "throttle-debounce": "^5.0.0",
         "vue-types": "^3.0.0",
         "warning": "^4.0.0"
       }
@@ -21092,6 +21135,11 @@
         "postcss-selector-parser": "^6.0.4"
       }
     },
+    "stylis": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmmirror.com/stylis/-/stylis-4.3.1.tgz",
+      "integrity": "sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ=="
+    },
     "supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-5.5.0.tgz",
@@ -21296,6 +21344,11 @@
         }
       }
     },
+    "throttle-debounce": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-5.0.0.tgz",
+      "integrity": "sha512-2iQTSgkkc1Zyk0MeVrt/3BvuOXYPl/R8Z0U2xxo9rjwNciaHDG3R+Lm6dh4EeUci49DanvBnuqI6jshoQQRGEg=="
+    },
     "thunky": {
       "version": "1.1.0",
       "resolved": "https://registry.npmmirror.com/thunky/-/thunky-1.1.0.tgz",
diff --git a/package.json b/package.json
index eb6f7682..8a3ab0bf 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
-    "ant-design-vue": "^3.2.12",
+    "ant-design-vue": "^4.1.2",
     "axios": "^1.1.3",
     "babel-eslint": "^10.1.0",
     "core-js": "^3.8.3",
diff --git a/src/components/OpenPages.vue b/src/components/OpenPages.vue
index bf1a9dd1..526e7710 100644
--- a/src/components/OpenPages.vue
+++ b/src/components/OpenPages.vue
@@ -111,6 +111,7 @@ export default {
     line-height: 36px;
     cursor: pointer;
     flex-shrink: 0;
+    text-decoration: none;
   }
 
   .close {
diff --git a/src/components/drawers/AddOpenCourse.vue b/src/components/drawers/AddOpenCourse.vue
index 5186976c..83049d3c 100644
--- a/src/components/drawers/AddOpenCourse.vue
+++ b/src/components/drawers/AddOpenCourse.vue
@@ -2,8 +2,8 @@
   <a-drawer
     :visible="openCourseVisible"
     class="drawerStyle addonlineDrawer"
-    :width="1000"
-    title="开课"
+    :width="1300"
+    :closable="false"
     placement="right">
     <div class="drawerMain">
       <div class="header">
@@ -148,6 +148,8 @@
                 @blur="onBlurStart"
                 @focus="onFocusStart"
                 @select="onDateSelect"
+                :open="openStart"
+                @ok="onOkStart"
               />
 
               <span style="margin: 0 10px;">至</span>
@@ -164,6 +166,8 @@
                 @focus="onFocusEnd"
                 @blur="onBlurEnd"
                 @select="onDateEnd"
+                :open="openEnd"
+                @ok="onOkEnd"
               />
             </div>
           </div>
@@ -304,7 +308,7 @@
                         :check-value="1"
                         :un-check-value="0"
                         @change="toggleCheckboxes('projectSignFlag')">
-                <span style="color: #6d7584">允许项目内人员临时到场参加(不在本场次培训的人员可以临时签到参加)</span>
+                <span style="color: #6d7584">允许项目内人员临时到场参加(不在本场次培训的人员可以临时签到评估)</span>
               </CheckBox>
               <CheckBox v-model="formData.outSignFlag"
                         :check-value="1"
@@ -412,7 +416,7 @@
   </a-drawer>
 </template>
 <script setup lang="jsx">
-import {defineProps, ref, nextTick, computed} from "vue";
+import {defineProps, ref, nextTick, computed,defineEmits  } from "vue";
 import {Form, message} from "ant-design-vue";
 import FJUpload from "@/components/common/FJUpload";
 import CheckBox from "@/components/common/CheckBox";
@@ -422,7 +426,7 @@ import AddHomework from "@/components/drawers/CommonHomework.vue";
 import AddTest from "@/components/drawers/CommonTest.vue";
 import NameInput from "@/components/project/NameInput";
 import AssessmentList from "@/components/drawers/AssessmentList.vue";
-import {COURSE_PLAN_EDIT, COURSE_PLAN_PAGE, DEL_PLAN, EXAM_DETAIL, WORK_DETAIL,PROJECT_DETAIL_MODIFY} from "@/api/apis";
+import {COURSE_PLAN_EDIT, COURSE_PLAN_PAGE, DEL_PLAN, EXAM_DETAIL, WORK_DETAIL,PROJECT_DETAIL_MODIFY,PROJECT_RELEASE} from "@/api/apis";
 import dayjs from "dayjs";
 import BaseTable from "@/components/common/BaseTable";
 import {request,useRowsPageNoInit} from "@/api/request";
@@ -646,18 +650,23 @@ function timeChange(timeStr) {
   // formData.value.duration = durationText.value
   // formData.value.duration || (formData.value.duration = dayjs(timeStr[1]).diff(dayjs(timeStr[0]),'minute'))
 }
-  function onDateSelect(date) {
-    const month = String(date.$M+1).padStart(2, '0')
-    const day = String(date.$D).padStart(2, '0')
-    const hour = String(date.$D).padStart(2, '0')
-    const minute = String(date.$D).padStart(2, '0')
-    dateTime.value[0]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
-  }
-function onBlurStart(){
-  
-  console.log(dateTime.value[0],'111')
+function onDateSelect(date) {
+  const month = String(date.$M+1).padStart(2, '0')
+  const day = String(date.$D).padStart(2, '0')
+  const hour = String(date.$D).padStart(2, '0')
+  const minute = String(date.$D).padStart(2, '0')
+  dateTime.value[0]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
+}
+const openStart = ref(false)
+const onOkStart = ()=>{
+  openStart.value = false
+}
+function onBlurStart(e){
+  dateTime.value[0]=e.target.value
+  openStart.value = false
 }
 function onFocusStart(){
+  openStart.value = true
   if(!dateTime.value[0]){
     let now=new Date()
     let start=new Date(now.setFullYear(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0))
@@ -670,6 +679,14 @@ function onFocusStart(){
 function timeChangeEnd(timeStr){
   formData.value.endTime = timeStr;
 }
+const openEnd = ref(false)
+const onOkEnd = ()=>{
+  openEnd.value = false
+}
+function onBlurEnd(e){
+  dateTime.value[1]=e.target.value
+  openEnd.value = false
+}
 function onDateEnd(date) {
     const month = String(date.$M+1).padStart(2, '0')
     const day = String(date.$D).padStart(2, '0')
@@ -678,6 +695,7 @@ function onDateEnd(date) {
     dateTime.value[1]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
   }
 function onFocusEnd(){
+  openEnd.value = true
   if(!dateTime.value[1]){
     let now=new Date()
        let start=new Date()
@@ -712,12 +730,17 @@ const closeDrawer = () => {
 };
 const route = useRoute();
 const projectInfo = ref({});
+const emit = defineEmits(['call-parent-method']);
 const confirm = async()=>{
   closeDrawer();
   await api.getDraftTask({projectId: route.query.projectId}).then((res) => {
     projectInfo.value = res.data.data
   });
   request(PROJECT_DETAIL_MODIFY, { ...projectInfo.value });
+  //projectInfo.value.projectInfo.status=3
+  //request(PROJECT_RELEASE, {projectId: route.query.projectId})
+  
+  emit('call-parent-method');
 }
 
 const createNewCourse = () => {
@@ -763,6 +786,7 @@ const del = (id,record) => {
 };
 
 async function coursePlanConfirm() {
+  
   if(!dateTime.value[0]){
     message.info('开始时间未填写')
     return
diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index 499da2e2..d33fdb3c 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -115,14 +115,13 @@
             :infoType="type"
             @finash="submitCall"
           >
-            <a-button class="cus-btn" style="background: #4ea6ff; color: #fff">
-              <template #icon><img style="margin-right: 10px" src="../../../assets/images/courseManage/add0.png"/>
-              </template>
-              添加学员
-            </a-button>
+            <div :class="{ 'notClick': courseSelectRows.length > 0 }" class="btn btn1">
+              <div class="img3"></div>
+              <div class="wz">添加学员</div>
+            </div>
           </CommonStudent>
           <CommonImport @change="change" title="导入学员" :template-url="stuTemplateUrl" :data="{ targetId: offcoursePlanId, type:3 }" :url="`/admin/student/importStudent`" name="uploadFile">
-            <div class="btn btn1" style="margin-right: 20px;margin-left: 20px">
+            <div  :class="{ 'notClick': courseSelectRows.length > 0 }" class="btn btn1" style="margin-right: 20px;margin-left: 20px">
               <div class="img1"></div>
               <div class="wz">导入学员</div>
             </div>
@@ -292,7 +291,7 @@ const columns = ref([
     ellipsis: true,
     className: "h",
     customRender: (text) =>
-      <span>{text.record.signStatus ? "签到" : text.record.leaveStatus ? "请假" : inAttendanceTime.value ? "-" : "缺勤"}</span>
+      <span>{text.record.signStatus ? "签到" : text.record.leaveStatus ? "请假" : inAttendanceTime.value ? "未签到" : "缺勤"}</span>
   },
   {
     title: "签到状态",
@@ -303,7 +302,7 @@ const columns = ref([
     ellipsis: true,
     className: "h",
     customRender: (text) =>
-      <span>{(text.record.signStatus || text.record.leaveStatus) ? "正常" : inAttendanceTime.value ? "-" : "异常"}</span>
+      <span>{(text.record.signStatus || text.record.leaveStatus) ? "正常" : inAttendanceTime.value ? "未签到" : "异常"}</span>
   },
   {
     title: "考勤情况",
@@ -483,12 +482,12 @@ const change = (e) => {
 .notClick{
   // cursor: pointer;
   // pointer-events: none;
-  // width: 100px;
-  // height: 40px;
-  // border: 1px solid #3b3c3c !important;
-  // border-radius: 8px;
-  // color: #fff !important;
-  // background-color: #3b3c3c !important;
+  width: 100px;
+  height: 40px;
+  border: 1px solid #d7d7d7 !important;
+  border-radius: 8px;
+  color: #fff !important;
+  background-color: #d7d7d7 !important;
   }
 
 .me {
@@ -735,6 +734,13 @@ const change = (e) => {
               background-size: 100% 100%;
               margin-right: 7px;
             }
+            .img3 {
+              width: 15px;
+              height: 17px;
+              background-image: url(../../../assets/images/courseManage/add0.png);
+              background-size: 100% 100%;
+              margin-right: 7px;
+            }
           }
 
           .btn1 {
@@ -780,6 +786,13 @@ const change = (e) => {
             background-size: 100% 100%;
             margin-right: 7px;
           }
+          .img3 {
+              width: 19px;
+              height: 19px;
+              background-image: url(../../../assets/images/courseManage/add0.png);
+              background-size: 100% 100%;
+              margin-right: 7px;
+            }
         }
 
         .btn1 {
diff --git a/src/main.js b/src/main.js
index 89316265..0c99ded7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,7 +15,7 @@ import 'element-plus/dist/index.css'
 // import zhCn from 'element-plus/es/locale/lang/zh-cn'
 import "@/assets/scss/common.scss"
 import Antd from 'ant-design-vue';
-import 'ant-design-vue/dist/antd.css';
+import 'ant-design-vue/dist/reset.css';
 import {request} from "@/api/request";
 import {USER_INFO, USER_PERMISSION, VALIDATE_TOKEN} from "@/api/apis";
 import * as api1 from "@/api/index1";
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index ced9b988..5248c03d 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -965,6 +965,8 @@
                 @blur="onBlurStart"
                 @focus="onFocusStart"
                 @select="onDateSelect"
+                :open="openStart"
+                @ok="onOkStart"
               />
               <span style="margin: 0 10px;">至</span>
               <a-date-picker
@@ -979,6 +981,8 @@
                 @focus="onFocusEnd"
                 @blur="onBlurEnd"
                 @select="onDateEnd"
+                :open="openEnd"
+                @ok="onOkEnd"
               />
             </div>
           </div>
@@ -2898,11 +2902,16 @@ export default defineComponent({
     const minute = String(date.$D).padStart(2, '0')
     state.xjkkinputV3[0]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
   }
-function onBlurStart(){
-  onFocusStart()
-  console.log(state.xjkkinputV3[0],'dateTime')
+  const openStart = ref(false)
+const onOkStart = ()=>{
+  openStart.value = false
+}
+function onBlurStart(e){
+  state.xjkkinputV3[0]=e.target.value
+  openStart.value = false
 }
 function onFocusStart(){
+  openStart.value = true
   if(!state.xjkkinputV3[0]){
     let now=new Date()
     let start=new Date(now.setFullYear(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0))
@@ -2922,7 +2931,16 @@ function onDateEnd(date) {
     const minute = String(date.$D).padStart(2, '0')
     state.xjkkinputV3[1]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
   }
+  const openEnd = ref(false)
+const onOkEnd = ()=>{
+  openEnd.value = false
+}
+function onBlurEnd(e){
+  state.xjkkinputV3[1]=e.target.value
+  openEnd.value = false
+}
 function onFocusEnd(){
+  openEnd.value = true
   if(!state.xjkkinputV3[1]){
     let now=new Date()
        let start=new Date()
@@ -5216,11 +5234,16 @@ function onFocusEnd(){
       editBeginClass,
 
       onDateSelect,
+      onOkStart,
+      openStart,
       onBlurStart,
       onFocusStart,
       // timeChangeEnd,
       onDateEnd,
+      openEnd,
+      onOkEnd,
       onFocusEnd,
+      onBlurEnd,
       inputWeightChange,
       totalWeightSum,
       inputAdd,
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 5e5487f4..0cbb0d10 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -637,13 +637,14 @@
                               </a-menu>
                             </template>
                           </a-dropdown>
-                        </div>
-                        <div class="operations_dropdown" v-if="item.assessmentIds.filter(id => id !== null).length==1&&item.type == 2">
-                          <a class="ant-dropdown-link" @click="qrcodeAssement(item)">
+                          <div v-if="item.assessmentIds.filter(id => id !== null).length==1&&item.type == 2">
+                            <a class="ant-dropdown-link" @click="qrcodeAssement(item)">
                               评估二维码
                               <DownOutlined />
                             </a>
+                          </div>
                         </div>
+                        
                         <div class="operations_dropdown" v-if="item.assessmentIds.length!=1">
                           <a-dropdown :getPopupContainer='(triggerNode) => triggerNode.parentNode' v-if="item.type == 2" :trigger="['click']" v-model:visible="visibleEwm[item.id]">
                             <a class="ant-dropdown-link" @click="qrcodeVisible(item)">
@@ -2342,7 +2343,7 @@
     />
     <!-- 换组弹窗 -->
     <!-- 面授课开课弹框 -->
-    <AddOpenCourse ref="coursePlanRef" :type="1"/>
+    <AddOpenCourse @call-parent-method="getTaskListAll" ref="coursePlanRef" :type="1"/>
   </div>
 </template>
 <script lang="jsx">
@@ -2403,6 +2404,8 @@ import ChangeGroupModal from "@/components/student/ChangeGroupModal.vue";
 import { checkPer,fixDoublePer } from "@/utils/utils";
 import ImpoterGroupLeader from "@/components/drawers/project/ImpoterGroupLeader.vue";
 import qrCode from "@/utils/qrCode";
+import {request} from "@/api/request";
+import { PROJECT_RELEASE} from "@/api/apis";
 export default {
   name: "taskPage",
   components: {
@@ -3198,6 +3201,14 @@ export default {
       return store.state.orgtreeList ? store.state.orgtreeList : [];
     });
     //任务大纲渲染
+    const getTaskListAll = () =>{
+      // request(PROJECT_RELEASE, {projectId: route.query.projectId})
+      getTaskList();
+      getTaskInfo();
+      getGroup();
+      getOverview();
+      reget();
+    }
     const getTaskList = () => {
       let objtl = {
         projectId: state.projectId,
@@ -5137,6 +5148,7 @@ export default {
       showCodeModal,
       tabsChange,
       getTaskList,
+      getTaskListAll,
       rankTimeChange,
       getbillboard,
       rankSearch,
@@ -5227,7 +5239,8 @@ export default {
       handleMenuClickpg,
       coursePlanRef,
       openCourse,
-      exportScore
+      exportScore,
+      
       
       
       
@@ -6657,7 +6670,7 @@ export default {
       flex-shrink: 0;
       margin-right: 24px;
       display: flex;
-      flex-wrap: wrap;
+      // flex-wrap: wrap;
       align-items: center;
       padding: 25px 0px;
       margin-left: 22px;
@@ -6735,7 +6748,7 @@ export default {
       }
 
       .progress {
-        width: 168px;
+        width: 60px;
         margin-left: 10px;
         margin-right: 50px;
         flex-grow: 1;
@@ -6743,9 +6756,9 @@ export default {
               cursor: pointer;
               width: 16px;
               height: 18px;
-              background-image: url(@/assets/images/coursewareManage/export1.png);
+              background-image: url(@/assets/images/coursewareManage/export.png);
               background-size: 100% 100%;
-              background-color: #4ea6ff;
+              // background-color: #4ea6ff;
               margin-left: 7px;
             }
         .progresstext {