From cdf0c5e4eccdd09e5e583218fdc5a743e7b621e1 Mon Sep 17 00:00:00 2001 From: dongwug Date: Fri, 21 Oct 2022 16:12:45 +0800 Subject: [PATCH 01/11] =?UTF-8?q?feat:=E5=AE=8C=E5=96=84=E5=AD=97=E6=95=B0?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddActive.vue | 2 ++ src/components/drawers/AddDiscuss.vue | 1 + src/components/drawers/AddEval.vue | 1 + src/components/drawers/AddFaceteach.vue | 5 ++++- src/components/drawers/AddHomework.vue | 2 ++ src/components/drawers/AddInvist.vue | 4 +++- src/components/drawers/AddLive.vue | 2 ++ src/components/drawers/AddRef.vue | 1 + src/components/drawers/AddTest.vue | 2 ++ src/components/drawers/AddVote.vue | 2 ++ src/views/courselibrary/CoursewareManage.vue | 15 ++++++++++++--- 11 files changed, 32 insertions(+), 5 deletions(-) diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index c0ea88cc..91e33ba6 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -33,6 +33,7 @@ v-model:value="inputV1" style="width: 424px; height: 32px" placeholder="请输入活动名称" + maxlength="20" /> @@ -51,6 +52,7 @@ v-model:value="textV1" placeholder="请输入活动公告" allow-clear + maxlength="150" /> diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index 40e13f3b..ac3e925b 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -33,6 +33,7 @@ v-model:value="inputV1" style="width: 424px; height: 32px" placeholder="请输入讨论名称" + maxlength="20" /> diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 396a1f6b..c0ebd6d6 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -33,6 +33,7 @@ v-model:value="inputV1" style="width: 424px; height: 32px" placeholder="请输入测评名称" + maxlength="20" /> diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 8625790d..b3017ce9 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -33,6 +33,7 @@ v-model:value="inputV1" style="width: 384px; height: 32px" placeholder="请输入小组名称" + maxlength="20" /> @@ -57,13 +58,14 @@
- 项目说明： + 面授说明：
@@ -134,6 +136,7 @@ v-model:value="inputV4" style="width: 384px; height: 32px" placeholder="请输入上课地址" + maxlength="100" /> diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index 4d77907c..7467682a 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -33,6 +33,7 @@ v-model:value="inputV1" style="width: 424px; height: 32px" placeholder="请输入作业名称" + maxlength="20" /> @@ -51,6 +52,7 @@ v-model:value="textV1" placeholder="请输入作业名称" allow-clear + maxlength="150" /> diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index 1fea350d..b8493a92 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -33,6 +33,7 @@ v-model:value="inputV1" style="width: 424px; height: 32px" placeholder="请输入测评名称" + maxlength="20" /> @@ -75,8 +76,9 @@
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 08f03cdb..8da74f75 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -33,6 +33,7 @@ v-model:value="inputV1" style="width: 424px; height: 32px" placeholder="请输入考试名称" + maxlength="20" /> @@ -45,6 +46,7 @@ v-model:value="textV1" placeholder="请输入考试说明" allow-clear + maxlength="150" /> diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue index aa513b4e..b4d56075 100644 --- a/src/components/drawers/AddRef.vue +++ b/src/components/drawers/AddRef.vue @@ -33,6 +33,7 @@ v-model:value="inputV1" style="width: 424px; height: 32px" placeholder="请输入外链名称" + maxlength="20" /> diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index d2d7249c..baa65f45 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -33,6 +33,7 @@ v-model:value="inputV1" style="width: 424px; height: 32px" placeholder="请输入考试名称" + maxlength="20" /> @@ -45,6 +46,7 @@ v-model:value="textV1" placeholder="请输入考试说明" allow-clear + maxlength="150" /> diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue index b3291947..e6389232 100644 --- a/src/components/drawers/AddVote.vue +++ b/src/components/drawers/AddVote.vue @@ -33,6 +33,7 @@ v-model:value="inputV1" style="width: 424px; height: 32px" placeholder="请输入投票名称" + maxlength="20" /> @@ -89,6 +90,7 @@ v-model:value="textV1" placeholder="请输入投票说明" allow-clear + maxlength="150" /> diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 7b4e5baf..18f29184 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -2813,7 +2813,10 @@ export default defineComponent({
-
删除
+
{ + state.delete_hs = true; + }}>删除
) : ( @@ -2822,7 +2825,10 @@ export default defineComponent({ {value.status === "已通过" ? (
-
删除
+
{ + state.delete_hs = true; + }}>删除
) : ( @@ -2831,7 +2837,10 @@ export default defineComponent({ {value.status === "已拒绝" ? (
-
删除
+
{ + state.delete_hs = true; + }}>删除
) : ( From fdcc7de35d486447dccd7f3d689f4c3d9447c068 Mon Sep 17 00:00:00 2001 From: wuyx Date: Fri, 21 Oct 2022 16:42:30 +0800 Subject: [PATCH 02/11] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0api=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=96=87=E4=BB=B6=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 106 ++++++++++++++++++++++++++++++++++++++++++---- package.json | 1 + src/api/config.js | 8 ++++ src/api/index.js | 20 +++++++++ 4 files changed, 127 insertions(+), 8 deletions(-) create mode 100644 src/api/config.js create mode 100644 src/api/index.js diff --git a/package-lock.json b/package-lock.json index 9a92ba29..ff7953d7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "0.1.0", "dependencies": { "ant-design-vue": "^3.2.12", + "axios": "^1.1.3", "core-js": "^3.8.3", "element-plus": "^2.2.17", "jquery": "^3.6.1", @@ -3549,6 +3550,11 @@ "resolved": "https://registry.npmmirror.com/async-validator/-/async-validator-4.2.5.tgz", "integrity": "sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==" }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, "node_modules/at-least-node": { "version": "1.0.0", "resolved": "https://registry.npmmirror.com/at-least-node/-/at-least-node-1.0.0.tgz", @@ -3581,6 +3587,16 @@ "postcss": "^8.1.0" } }, + "node_modules/axios": { + "version": "1.1.3", + "resolved": "https://registry.npmmirror.com/axios/-/axios-1.1.3.tgz", + "integrity": "sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==", + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/babel-loader": { "version": "8.2.5", "resolved": "https://registry.npmmirror.com/babel-loader/-/babel-loader-8.2.5.tgz", @@ -4166,6 +4182,17 @@ "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", "dev": true }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/commander": { "version": "8.3.0", "resolved": "https://registry.npmmirror.com/commander/-/commander-8.3.0.tgz", @@ -4858,6 +4885,14 @@ "node": ">= 0.4" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/depd/-/depd-2.0.0.tgz", @@ -6036,7 +6071,6 @@ "version": "1.15.2", "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.2.tgz", "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", - "dev": true, "engines": { "node": ">=4.0" }, @@ -6046,6 +6080,19 @@ } } }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmmirror.com/forwarded/-/forwarded-0.2.0.tgz", @@ -7442,7 +7489,6 @@ "version": "1.52.0", "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, "engines": { "node": ">= 0.6" } @@ -7451,7 +7497,6 @@ "version": "2.1.35", "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, "dependencies": { "mime-db": "1.52.0" }, @@ -8838,6 +8883,11 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/pseudomap": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/pseudomap/-/pseudomap-1.0.2.tgz", @@ -13962,6 +14012,11 @@ "resolved": "https://registry.npmmirror.com/async-validator/-/async-validator-4.2.5.tgz", "integrity": "sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==" }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, "at-least-node": { "version": "1.0.0", "resolved": "https://registry.npmmirror.com/at-least-node/-/at-least-node-1.0.0.tgz", @@ -13982,6 +14037,16 @@ "postcss-value-parser": "^4.2.0" } }, + "axios": { + "version": "1.1.3", + "resolved": "https://registry.npmmirror.com/axios/-/axios-1.1.3.tgz", + "integrity": "sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==", + "requires": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "babel-loader": { "version": "8.2.5", "resolved": "https://registry.npmmirror.com/babel-loader/-/babel-loader-8.2.5.tgz", @@ -14468,6 +14533,14 @@ "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", "dev": true }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "requires": { + "delayed-stream": "~1.0.0" + } + }, "commander": { "version": "8.3.0", "resolved": "https://registry.npmmirror.com/commander/-/commander-8.3.0.tgz", @@ -15006,6 +15079,11 @@ "object-keys": "^1.1.1" } }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" + }, "depd": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/depd/-/depd-2.0.0.tgz", @@ -15963,8 +16041,17 @@ "follow-redirects": { "version": "1.15.2", "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", - "dev": true + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==" + }, + "form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } }, "forwarded": { "version": "0.2.0", @@ -17078,14 +17165,12 @@ "mime-db": { "version": "1.52.0", "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" }, "mime-types": { "version": "2.1.35", "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, "requires": { "mime-db": "1.52.0" } @@ -18105,6 +18190,11 @@ } } }, + "proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "pseudomap": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/pseudomap/-/pseudomap-1.0.2.tgz", diff --git a/package.json b/package.json index f7f60daa..aef43c56 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ }, "dependencies": { "ant-design-vue": "^3.2.12", + "axios": "^1.1.3", "core-js": "^3.8.3", "element-plus": "^2.2.17", "jquery": "^3.6.1", diff --git a/src/api/config.js b/src/api/config.js new file mode 100644 index 00000000..717e68d7 --- /dev/null +++ b/src/api/config.js @@ -0,0 +1,8 @@ +import axios from "axios"; + +const http = axios.create({ + baseURL: 'http://localhost:8082/api', + timeout: 1000 * 100 +}); + +export default http; \ No newline at end of file diff --git a/src/api/index.js b/src/api/index.js new file mode 100644 index 00000000..e1c0c215 --- /dev/null +++ b/src/api/index.js @@ -0,0 +1,20 @@ +import http from "./config"; + +// 接口 +export const getUserInfo = () => http.get('/'); +export const getUserById = (x, y, z) => http.post('/getuserbyid', { x, y, z }); + + +// 使用方法 +// import * as api from '../../api/index' +// api.getUserById(6, 7, 8).then(res => { +// console.log(res) +// }).catch(err => { +// console.log(err) +// }) + +// api.getUserInfo().then(res => { +// console.log(res) +// }).catch(err => { +// console.log(err) +// }) \ No newline at end of file From ec011ff29b61d860981d3823826d3861bafce717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=99=93=E9=B8=BD?= Date: Fri, 21 Oct 2022 16:52:07 +0800 Subject: [PATCH 03/11] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E4=BB=BB=E5=8A=A1=E5=A4=A7=E7=BA=B2?= =?UTF-8?q?=E7=9A=84=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskPage.vue | 317 ++++++++++++++++++++++++++- 1 file changed, 307 insertions(+), 10 deletions(-) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 84bd43ac..c16bd5d6 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -221,13 +221,145 @@ 编辑 -
+
+ + + +
+
+
+ +
+
+
「{{ item.course }}」
+
{{ item.name }}
+
+
+
+
+ {{ item.classify }} +
+
+
+
开始时间
+
{{ item.beginTime }}
+
+
+
+ {{ item.complete }}/{{ item.total }}人 +
+
+ + {{ item.percent }}% +
+
+
+
+ 学员 +
+
+ 考勤 +
+
+ 二维码 +
+
+ 管理 +
+
+
+ + +
+ +
@@ -1215,6 +1347,7 @@ From 21884aace3fe07cff72f7197de715308cdfa4631 Mon Sep 17 00:00:00 2001 From: dongwug Date: Sat, 22 Oct 2022 09:17:30 +0800 Subject: [PATCH 05/11] =?UTF-8?q?feat:=E6=A8=A1=E6=9D=BF=E5=BA=93=E8=87=AA?= =?UTF-8?q?=E9=80=82=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 212 ++++++++++++------- src/views/projectcenter/TemplateLibrary.vue | 12 +- 2 files changed, 150 insertions(+), 74 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 18f29184..021cb7c5 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -183,16 +183,22 @@
-
+
- 线上
-
+
- 面授
@@ -214,10 +220,20 @@
- 是 + 是
- 否 + 否
@@ -529,7 +545,9 @@
-
删除
+
+ 删除 +
@@ -549,7 +567,9 @@
-
删除
+
+ 删除 +
@@ -569,8 +589,12 @@
-
重传
-
取消
+
+ 重传 +
+
+ 取消 +
@@ -590,8 +614,14 @@
-
暂停
-
取消
+
+ 暂停 +
+
+ 取消 +
@@ -1080,7 +1110,11 @@ - +
- 是否允许未报名的学员签到 - 签到是否需要口令 @@ -1215,17 +1255,26 @@
- 报名即完成 - 签到即完成 - 请假算完成 @@ -1542,12 +1591,18 @@
- 结业
- 不结业
@@ -1737,7 +1792,7 @@ - +
@@ -1851,7 +1906,7 @@ const columns1 = [ align: "center", }, ]; - +//列表操作在线面授管理 const columns2 = [ { title: "姓名", @@ -1896,6 +1951,7 @@ const columns2 = [ align: "center", }, ]; +//管理查看详情 const columns4 = [ { title: "开课名称", @@ -1919,7 +1975,7 @@ const columns4 = [ align: "center", }, ]; -//授权弹窗 +//5授权弹窗 6是开课表格 // const columns5 = [ // { // title: "姓名", @@ -1957,6 +2013,8 @@ const columns4 = [ // align: "center", // }, // ]; + +//开课表格 const columns6 = [ { title: "序号", @@ -2001,6 +2059,7 @@ const columns6 = [ align: "center", }, ]; +//开课学员管理 const columns7 = [ { title: "序号", @@ -2234,7 +2293,7 @@ export default defineComponent({ }, ], - // 授权弹窗 + // 5授权弹窗 6开课 // tableData5: [ // { // key: 1, @@ -2331,7 +2390,6 @@ export default defineComponent({ signstatus: "-", evastatus: "-", overstatus: "-", - operation: "2022-07-20 9:30", }, { key: "2", @@ -2346,7 +2404,6 @@ export default defineComponent({ signstatus: "已签到", evastatus: "已评估", overstatus: "-", - operation: "2022-07-20 9:30", }, { key: "3", @@ -2361,7 +2418,6 @@ export default defineComponent({ signstatus: "-", evastatus: "-", overstatus: "-", - operation: "2022-07-20 9:30", }, { key: "4", @@ -2376,7 +2432,6 @@ export default defineComponent({ signstatus: "已签到", evastatus: "-", overstatus: "90/已结业", - operation: "2022-07-20 9:30", }, { key: "5", @@ -2391,12 +2446,13 @@ export default defineComponent({ signstatus: "请假", evastatus: "-", overstatus: "", - operation: "2022-07-20 9:30", }, ], currentPage: 1, tableDataTotal: 100, pageSize: 10, + selectedRowKeys: [], + faceManageTab: "1", of_hs: false, hideshow: true, bs_hs: true, @@ -2422,7 +2478,7 @@ export default defineComponent({ olQR_hs: false, ftQR_hs: false, ftsQR_hs: false, - vipftQR_hs:false, + vipftQR_hs: false, //抽屉状态 ownpowervisible: false, corpowerlistvisible: false, @@ -2443,28 +2499,26 @@ export default defineComponent({ qdms_inputV5: "", qdms_inputV6: "", //在线面授管理 - gl_selectV1:"", - gl_selectV2:"", - gl_inputV1:"", - gl_inputV2:"", + gl_selectV1: "", + gl_selectV2: "", + gl_inputV1: "", + gl_inputV2: "", //开课 kkinputV1: "", kkinputV2: "", //新建开课 - xjkkradioV1:"", - xjkkradioV2:"", + xjkkradioV1: "", + xjkkradioV2: "", xjkkinputV1: "", xjkkinputV2: "", xjkkinputV3: "", xjkkinputV4: "", - selectedRowKeys: [], - faceManageTab: "1", //开课学员管理 - xygl_inputV1:"", + xygl_inputV1: "", //录入成绩 - lrcj_inputV1:"", + lrcj_inputV1: "", //结业 - jyradioV1:"", + jyradioV1: "", }); // 渲染列表1操作 const getTableDate = () => { @@ -2813,10 +2867,14 @@ export default defineComponent({
-
{ +
{ state.delete_hs = true; - }}>删除
+ }} + > + 删除 +
) : ( @@ -2825,10 +2883,14 @@ export default defineComponent({ {value.status === "已通过" ? (
-
{ +
{ state.delete_hs = true; - }}>删除
+ }} + > + 删除 +
) : ( @@ -2837,10 +2899,14 @@ export default defineComponent({ {value.status === "已拒绝" ? (
-
{ state.delete_hs = true; - }}>删除
+ }} + > + 删除 +
) : ( @@ -3096,7 +3162,7 @@ export default defineComponent({ const bs_hShow = (value) => { state.bs_hs = true; if (value != "") { - state.valueE1 = ""; + state.valueE1 = ""; } }; const createft = () => { @@ -3120,9 +3186,9 @@ export default defineComponent({ const ftsr_exit = () => { state.om_ckxq = false; }; - const gpm_exit = () => { - state.gpm_hs = false; - }; + // const gpm_exit = () => { + // state.gpm_hs = false; + // }; const stm_exit = () => { state.stm_hs = false; }; @@ -3133,9 +3199,9 @@ export default defineComponent({ state.cstm_hs = false; state.xjkkradioV1 = ""; state.xjkkradioV2 = ""; - state.xjkkinputV1 = ""; - state.xjkkinputV2 = ""; - state.xjkkinputV3 = ""; + state.xjkkinputV1 = ""; + state.xjkkinputV2 = ""; + state.xjkkinputV3 = ""; state.xjkkinputV4 = ""; }; const sm_exit = () => { @@ -3150,20 +3216,20 @@ export default defineComponent({ state.valueE2 = ""; }; const clear_xjkkradioV1 = (value) => { - if (value != ""){ + if (value != "") { state.xjkkradioV1 = ""; } - } + }; const clear_xjkkradioV2 = (value) => { - if (value != ""){ + if (value != "") { state.xjkkradioV2 = ""; } - } + }; const clear_jyradioV1 = (value) => { - if (value != ""){ + if (value != "") { state.jyradioV1 = ""; } - } + }; const qr_exit = () => { state.QR_hs = false; state.qrQR_hs = false; @@ -3223,10 +3289,10 @@ export default defineComponent({ // columns5, columns6, columns7, - getTableDate, - getTableDate2, options1, options2, + // getTableDate, + // getTableDate2, of_hShow, of_exit, hideShow, @@ -3236,7 +3302,7 @@ export default defineComponent({ om_exit, ckxq_hs, ftsr_exit, - gpm_exit, + // gpm_exit, stm_exit, createkk, cstm_exit, @@ -3296,7 +3362,6 @@ export default defineComponent({ .btns { display: flex; margin-left: 38px; - cursor: pointer; .btn { padding: 0px 26px 0px 26px; height: 38px; @@ -3308,6 +3373,7 @@ export default defineComponent({ justify-content: center; margin-right: 14px; flex-shrink: 0; + cursor: pointer; .search { background-size: 100%; } @@ -4436,12 +4502,12 @@ export default defineComponent({ } } .file_operation { - display: flex; - .fobox{ - margin-right: 5px; - cursor: pointer; - } + display: flex; + .fobox { + margin-right: 5px; + cursor: pointer; } + } } } } diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue index e04226f8..f2a349d2 100644 --- a/src/views/projectcenter/TemplateLibrary.vue +++ b/src/views/projectcenter/TemplateLibrary.vue @@ -203,22 +203,31 @@ export default defineComponent({ width:100%; .tmpl_header{ display:flex; + flex-wrap: wrap; justify-content: space-between; - margin: 32px; + margin-bottom: 32px; + + margin-left: 32px; + margin-right: 32px; .tmplh_inp{ .inpbox{ display: flex; + margin-top: 32px; .inpbox1{ display:flex; justify-content: center; align-items: center; margin-right: 24px; + span{ + white-space: nowrap; + } } } } .tmplh_btn{ display: flex; margin-left: 38px; + margin-top: 32px; .btn { padding: 0px 26px 0px 26px; height: 38px; @@ -295,6 +304,7 @@ export default defineComponent({ display: flex; .jc { margin-left: 20px; + white-space: nowrap; cursor: pointer; } } From 8f28d32b0b634dcb2fc9712f47598f9b03894c52 Mon Sep 17 00:00:00 2001 From: songwc Date: Sat, 22 Oct 2022 09:49:34 +0800 Subject: [PATCH 06/11] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BD=92=E5=B1=9E=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ProjectOwn.vue | 806 ++++++++++++++++++++++ src/views/projectcenter/ProjectManage.vue | 56 +- 2 files changed, 846 insertions(+), 16 deletions(-) create mode 100644 src/components/drawers/ProjectOwn.vue diff --git a/src/components/drawers/ProjectOwn.vue b/src/components/drawers/ProjectOwn.vue new file mode 100644 index 00000000..9dd0a596 --- /dev/null +++ b/src/components/drawers/ProjectOwn.vue @@ -0,0 +1,806 @@ + + + + + \ No newline at end of file diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 30428fa0..c93a8d1a 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -519,10 +519,14 @@ + + + + + \ No newline at end of file diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index c93a8d1a..49c82cfc 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -522,11 +522,14 @@ + + + + \ No newline at end of file diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 14a8544d..97e02bcd 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -212,7 +212,7 @@
任务大纲
- + + +
@@ -1163,6 +1165,7 @@ import StuAdd from "../../components/drawers/StuAdd"; import ImportStu from "../../components/drawers/ImportStu"; import SeeStu from "../../components/drawers/SeeStu"; import ChangeGroup from "../../components/drawers/ChangeGroup"; +import TaskImpStu from "../../components/drawers/TaskFaceIn"; export default { name: "taskPage", components: { @@ -1179,6 +1182,7 @@ export default { ImportStu, SeeStu, ChangeGroup, + TaskImpStu, }, setup() { const state = reactive({ @@ -1361,6 +1365,7 @@ export default { valueDate: "", //排行榜输入日期 noticeChecked: true, noticeContent: "请输入要发布的公告", + TaskFaceImpStuvisible: false, //批量面授报名 //进度排行表 jindutabledata: [ @@ -1829,6 +1834,9 @@ export default { const closeModal2 = () => { state.stugroup = false; }; + const showFaceIn = () => { + state.TaskFaceImpStuvisible = true; + }; //新增 const showTime = (course, name) => { console.log("点击管理"); @@ -1908,6 +1916,7 @@ export default { showImportStu, showSeeStu, showChangeGroup, + showFaceIn, }; }, }; From 570024e06cfc7bb22f92debed34c8b68f4244189 Mon Sep 17 00:00:00 2001 From: songwc Date: Sat, 22 Oct 2022 11:09:24 +0800 Subject: [PATCH 11/11] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E9=9D=A2=E6=8E=88=E6=8A=A5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskPage.vue | 29 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 940acbca..3e3cb32e 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -209,19 +209,20 @@ -
-
-
任务大纲
- - - - 编辑 - -
-
+
+
+
+
任务大纲
+ + + + 编辑 + +
+