From c0b856413b6641468e5eec94e7824c528df8a84d Mon Sep 17 00:00:00 2001 From: zhangsir Date: Mon, 5 Feb 2024 18:47:14 +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 | 87 ++++---------------- package.json | 2 +- src/components/OpenPages.vue | 1 - src/components/drawers/AddOpenCourse.vue | 45 +++++----- src/main.js | 2 +- src/views/courselibrary/CoursewareManage.vue | 23 +++--- src/views/projectcenter/TaskPage.vue | 11 ++- 7 files changed, 59 insertions(+), 112 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9936be4d..b5f3909e 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": "^4.1.2", + "ant-design-vue": "^3.2.12", "axios": "^1.1.3", "babel-eslint": "^10.1.0", "core-js": "^3.8.3", @@ -88,9 +88,9 @@ "integrity": "sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA==" }, "node_modules/@ant-design/icons-vue": { - "version": "7.0.1", - "resolved": "https://registry.npmmirror.com/@ant-design/icons-vue/-/icons-vue-7.0.1.tgz", - "integrity": "sha512-eCqY2unfZK6Fe02AwFlDHLfoyEFreP6rBwAZMIJ1LugmfMiVgwWDYlp1YsRugaPtICYOabV1iWxXdP12u9U43Q==", + "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==", "dependencies": { "@ant-design/colors": "^6.0.0", "@ant-design/icons-svg": "^4.2.1" @@ -1870,16 +1870,6 @@ "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", @@ -3808,20 +3798,17 @@ } }, "node_modules/ant-design-vue": { - "version": "4.1.2", - "resolved": "https://registry.npmmirror.com/ant-design-vue/-/ant-design-vue-4.1.2.tgz", - "integrity": "sha512-ynFkDJLlHgumeK6Hr1UZ7PvQNZ1uBcri/pmejBdS3kRqHeA5VRsxneYDwa8YxA+uYB5YfT2jpYsSHsiMiCjRGg==", + "version": "3.2.20", + "resolved": "https://registry.npmmirror.com/ant-design-vue/-/ant-design-vue-3.2.20.tgz", + "integrity": "sha512-YWpMfGaGoRastIXEYfCoJiaRiDHk4chqtYhlKQM5GqPt6NfvrM1Vg2e60yHtjxlZjed91wCMm0rAmyUr7Hwzdg==", "dependencies": { "@ant-design/colors": "^6.0.0", - "@ant-design/icons-vue": "^7.0.0", + "@ant-design/icons-vue": "^6.1.0", "@babel/runtime": "^7.10.5", - "@ctrl/tinycolor": "^3.5.0", - "@emotion/hash": "^0.9.0", - "@emotion/unitless": "^0.8.0", + "@ctrl/tinycolor": "^3.4.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", @@ -3830,8 +3817,6 @@ "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" }, @@ -10940,11 +10925,6 @@ "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", @@ -11204,14 +11184,6 @@ "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", @@ -12603,9 +12575,9 @@ "integrity": "sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA==" }, "@ant-design/icons-vue": { - "version": "7.0.1", - "resolved": "https://registry.npmmirror.com/@ant-design/icons-vue/-/icons-vue-7.0.1.tgz", - "integrity": "sha512-eCqY2unfZK6Fe02AwFlDHLfoyEFreP6rBwAZMIJ1LugmfMiVgwWDYlp1YsRugaPtICYOabV1iWxXdP12u9U43Q==", + "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==", "requires": { "@ant-design/colors": "^6.0.0", "@ant-design/icons-svg": "^4.2.1" @@ -13828,16 +13800,6 @@ "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", @@ -15432,20 +15394,17 @@ } }, "ant-design-vue": { - "version": "4.1.2", - "resolved": "https://registry.npmmirror.com/ant-design-vue/-/ant-design-vue-4.1.2.tgz", - "integrity": "sha512-ynFkDJLlHgumeK6Hr1UZ7PvQNZ1uBcri/pmejBdS3kRqHeA5VRsxneYDwa8YxA+uYB5YfT2jpYsSHsiMiCjRGg==", + "version": "3.2.20", + "resolved": "https://registry.npmmirror.com/ant-design-vue/-/ant-design-vue-3.2.20.tgz", + "integrity": "sha512-YWpMfGaGoRastIXEYfCoJiaRiDHk4chqtYhlKQM5GqPt6NfvrM1Vg2e60yHtjxlZjed91wCMm0rAmyUr7Hwzdg==", "requires": { "@ant-design/colors": "^6.0.0", - "@ant-design/icons-vue": "^7.0.0", + "@ant-design/icons-vue": "^6.1.0", "@babel/runtime": "^7.10.5", - "@ctrl/tinycolor": "^3.5.0", - "@emotion/hash": "^0.9.0", - "@emotion/unitless": "^0.8.0", + "@ctrl/tinycolor": "^3.4.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", @@ -15454,8 +15413,6 @@ "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" } @@ -21135,11 +21092,6 @@ "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", @@ -21344,11 +21296,6 @@ } } }, - "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 8a3ab0bf..eb6f7682 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": "^4.1.2", + "ant-design-vue": "^3.2.12", "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 526e7710..bf1a9dd1 100644 --- a/src/components/OpenPages.vue +++ b/src/components/OpenPages.vue @@ -111,7 +111,6 @@ 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 83049d3c..77bea4fa 100644 --- a/src/components/drawers/AddOpenCourse.vue +++ b/src/components/drawers/AddOpenCourse.vue @@ -2,8 +2,8 @@
@@ -657,16 +657,16 @@ function onDateSelect(date) { 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 -} +// 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 + // 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)) @@ -679,14 +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 -} +// 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') @@ -695,7 +695,7 @@ function onDateEnd(date) { dateTime.value[1]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute } function onFocusEnd(){ - openEnd.value = true + // openEnd.value = true if(!dateTime.value[1]){ let now=new Date() let start=new Date() @@ -737,9 +737,8 @@ const confirm = async()=>{ projectInfo.value = res.data.data }); request(PROJECT_DETAIL_MODIFY, { ...projectInfo.value }); - //projectInfo.value.projectInfo.status=3 - //request(PROJECT_RELEASE, {projectId: route.query.projectId}) - + projectInfo.value.projectInfo.status=3 + request(PROJECT_RELEASE, {projectId: route.query.projectId}) emit('call-parent-method'); } diff --git a/src/main.js b/src/main.js index 0c99ded7..89316265 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/reset.css'; +import 'ant-design-vue/dist/antd.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 5248c03d..3c3942b1 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -2902,16 +2902,16 @@ export default defineComponent({ const minute = String(date.$D).padStart(2, '0') state.xjkkinputV3[0]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute } - const openStart = ref(false) +// const openStart = ref(false) const onOkStart = ()=>{ - openStart.value = false + // openStart.value = false } function onBlurStart(e){ - state.xjkkinputV3[0]=e.target.value - openStart.value = false + // state.xjkkinputV3[0]=e.target.value + // openStart.value = false } function onFocusStart(){ - openStart.value = true + // 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)) @@ -2933,14 +2933,14 @@ function onDateEnd(date) { } const openEnd = ref(false) const onOkEnd = ()=>{ - openEnd.value = false + // openEnd.value = false } function onBlurEnd(e){ - state.xjkkinputV3[1]=e.target.value - openEnd.value = false + // state.xjkkinputV3[1]=e.target.value + // openEnd.value = false } function onFocusEnd(){ - openEnd.value = true + // openEnd.value = true if(!state.xjkkinputV3[1]){ let now=new Date() let start=new Date() @@ -5235,13 +5235,12 @@ function onFocusEnd(){ onDateSelect, onOkStart, - openStart, + // openStart, onBlurStart, onFocusStart, // timeChangeEnd, onDateEnd, - openEnd, - onOkEnd, + // onOkEnd, onFocusEnd, onBlurEnd, inputWeightChange, diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 0cbb0d10..b0405a83 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -588,7 +588,7 @@ {{ item.type==2 ? item.createTime !== null ? item.createTime : "-" : item.startTime !== null ? item.startTime : "-" }}
-
+