From 9fe8dd28805b5027cdfe66729b4b0a4f5665622f Mon Sep 17 00:00:00 2001 From: Net Date: Sat, 14 Jun 2025 13:09:26 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E6=8F=90=E4=BA=A41?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 21 +- src/pages/base/mine/index.vue | 965 +++++++++++++++++- src/pages/base/service/index.vue | 14 +- .../view/routine/JiaoXueZiYuan/index.vue | 697 +++++++------ .../view/routine/JiaoXueZiYuan/indexList.vue | 468 +++++++++ 5 files changed, 1800 insertions(+), 365 deletions(-) create mode 100644 src/pages/view/routine/JiaoXueZiYuan/indexList.vue diff --git a/src/pages.json b/src/pages.json index 5d20d17..91cb6fb 100644 --- a/src/pages.json +++ b/src/pages.json @@ -139,6 +139,13 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/view/routine/JiaoXueZiYuan/indexList", + "style": { + "navigationBarTitleText": "资源类型", + "enablePullDownRefresh": false + } + }, { "path": "pages/view/routine/HuoDongZiYuan/index", "style": { @@ -420,13 +427,13 @@ "pagePath": "pages/base/service/index", "iconPath": "static/tabBar/x2.png", "selectedIconPath": "static/tabBar/2.png" + }, + { + "text": "我的", + "pagePath": "pages/base/mine/index", + "iconPath": "static/tabBar/x3.png", + "selectedIconPath": "static/tabBar/3.png" } - // { - // "text": "我的", - // "pagePath": "pages/base/mine/index", - // "iconPath": "static/tabBar/x3.png", - // "selectedIconPath": "static/tabBar/3.png" - // } ] } -} \ No newline at end of file +} diff --git a/src/pages/base/mine/index.vue b/src/pages/base/mine/index.vue index 45aaa1d..90a09a1 100644 --- a/src/pages/base/mine/index.vue +++ b/src/pages/base/mine/index.vue @@ -1,14 +1,977 @@ \ No newline at end of file diff --git a/src/pages/base/service/index.vue b/src/pages/base/service/index.vue index 2174c6b..63e570c 100644 --- a/src/pages/base/service/index.vue +++ b/src/pages/base/service/index.vue @@ -153,13 +153,13 @@ const sections = reactive([ id: "routine", title: "常规", items: [ - { - id: 10, - text: "一师一策", - icon: "clipboardfill", - path: "/pages/view/routine/yishiyice/index", - show: true, - }, + // { + // id: 10, + // text: "一师一策", + // icon: "clipboardfill", + // path: "/pages/view/routine/yishiyice/index", + // show: true, + // }, { id: "r2", icon: "stack-fill", diff --git a/src/pages/view/routine/JiaoXueZiYuan/index.vue b/src/pages/view/routine/JiaoXueZiYuan/index.vue index 564691f..863f350 100644 --- a/src/pages/view/routine/JiaoXueZiYuan/index.vue +++ b/src/pages/view/routine/JiaoXueZiYuan/index.vue @@ -1,396 +1,393 @@ \ No newline at end of file diff --git a/src/pages/view/routine/JiaoXueZiYuan/indexList.vue b/src/pages/view/routine/JiaoXueZiYuan/indexList.vue new file mode 100644 index 0000000..5790ba6 --- /dev/null +++ b/src/pages/view/routine/JiaoXueZiYuan/indexList.vue @@ -0,0 +1,468 @@ + + + + + \ No newline at end of file From 15c65bd49fd34f7eee3b217c53b5084ce446e8f0 Mon Sep 17 00:00:00 2001 From: Net Date: Sat, 14 Jun 2025 14:08:44 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E6=8F=90=E4=BA=A41?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 23 +- src/pages/base/service/index.vue | 45 ++- .../view/hr/teacherProfile/PersonalHonor.vue | 56 ++-- .../hr/teacherProfile/PublicClassAwards.vue | 91 +++--- src/pages/view/routine/GongZuoLiang/index.vue | 0 src/pages/view/routine/JiFenPingJia.vue | 128 -------- .../routine/JiFenPingJia/JiFenPingJia.vue | 225 ++++++++++++++ .../view/routine/JiFenPingJia/detail.vue | 277 ++++++++++++++++++ .../view/routine/RengJiaoRengZhi/index.vue | 174 +++++++++++ .../view/routine/kefuxuncha/KeFuXunCha.vue | 11 +- 10 files changed, 793 insertions(+), 237 deletions(-) create mode 100644 src/pages/view/routine/GongZuoLiang/index.vue delete mode 100644 src/pages/view/routine/JiFenPingJia.vue create mode 100644 src/pages/view/routine/JiFenPingJia/JiFenPingJia.vue create mode 100644 src/pages/view/routine/JiFenPingJia/detail.vue create mode 100644 src/pages/view/routine/RengJiaoRengZhi/index.vue diff --git a/src/pages.json b/src/pages.json index 91cb6fb..72ef592 100644 --- a/src/pages.json +++ b/src/pages.json @@ -175,12 +175,19 @@ } }, { - "path": "pages/view/routine/JiFenPingJia", + "path": "pages/view/routine/JiFenPingJia/JiFenPingJia", "style": { "navigationBarTitleText": "积分评价", "enablePullDownRefresh": false } }, + { + "path": "pages/view/routine/JiFenPingJia/detail", + "style": { + "navigationBarTitleText": "评价详情", + "enablePullDownRefresh": false + } + }, { "path": "pages/view/routine/kefuxuncha/KeFuXunCha", "style": { @@ -390,6 +397,20 @@ "navigationBarTitleText": "zhujiaoDetails" } }, + { + "path": "pages/view/routine/RengJiaoRengZhi/index", + "style": { + "navigationBarTitleText": "任教任职", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/view/routine/GongZuoLiang/index", + "style": { + "navigationBarTitleText": "工作量", + "enablePullDownRefresh": false + } + }, { "path": "pages/base/groupTeaching/studentRollCall", "style": { diff --git a/src/pages/base/service/index.vue b/src/pages/base/service/index.vue index 63e570c..d9cda00 100644 --- a/src/pages/base/service/index.vue +++ b/src/pages/base/service/index.vue @@ -167,27 +167,42 @@ const sections = reactive([ show: true, path: "/pages/view/routine/JiaoXueZiYuan/index", }, - { - id: "r3", - icon: "file-list-3-fil", - text: "活动资源", - show: true, - path: "/pages/view/routine/HuoDongZiYuan/index", - }, - { - id: "r4", - icon: "file-paper-2-fill", - text: "公文流转", - show: true, - path: "/pages/view/routine/GongWenLiuZhuan/index", - }, { id: "r5", icon: "file-mark-fill", text: "积分评价", show: true, - path: "/pages/view/routine/JiFenPingJia", + path: "/pages/view/routine/JiFenPingJia/JiFenPingJia", }, + // { + // id: "r3", + // icon: "file-list-3-fil", + // text: "活动资源", + // show: true, + // path: "/pages/view/routine/HuoDongZiYuan/index", + // }, + { + id: "r3", + icon: "file-list-3-fil", + text: "工作量", + show: true, + path: "/pages/view/routine/GongZuoLiang/index", + }, + // { + // id: "r4", + // icon: "file-paper-2-fill", + // text: "公文流转", + // show: true, + // path: "/pages/view/routine/GongWenLiuZhuan/index", + // }, + { + id: "r4", + icon: "file-paper-2-fill", + text: "任教任职", + show: true, + path: "/pages/view/routine/RengJiaoRengZhi/index", + }, + { id: "r6", icon: "pass-pending-fill", diff --git a/src/pages/view/hr/teacherProfile/PersonalHonor.vue b/src/pages/view/hr/teacherProfile/PersonalHonor.vue index 7bae591..c8d3142 100644 --- a/src/pages/view/hr/teacherProfile/PersonalHonor.vue +++ b/src/pages/view/hr/teacherProfile/PersonalHonor.vue @@ -32,14 +32,8 @@