From a1db8818c302e9fcd05498f2d1c1de9a9c7ae931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Fri, 5 May 2023 16:37:05 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/trainingItem.js | 6 + .../system/InformationCategory/index.vue | 5 + src/views/system/trainingItem/index.vue | 386 +++++++++++++----- 3 files changed, 297 insertions(+), 100 deletions(-) diff --git a/src/api/system/trainingItem.js b/src/api/system/trainingItem.js index 137ea15..e2e7ad3 100644 --- a/src/api/system/trainingItem.js +++ b/src/api/system/trainingItem.js @@ -58,6 +58,12 @@ export function updateTrainingItem(data) { data: data }) } +export function selectSubordinateItem(trainingParentId) { + return request({ + url: `/system/trainingItem/selectSubordinateItem?trainingParentId=${trainingParentId}`, + method: 'get', + }) +} // 删除学习培训项目信息 export function delTrainingItem(id) { diff --git a/src/views/system/InformationCategory/index.vue b/src/views/system/InformationCategory/index.vue index 09c87bc..d02698b 100644 --- a/src/views/system/InformationCategory/index.vue +++ b/src/views/system/InformationCategory/index.vue @@ -317,6 +317,11 @@ export default { value: "HEALTH_NOUS", label: "健康常识", }, + { + value: "NURSING_NEWS", + label: "护理新闻", + + } ], value: "", // 遮罩层 diff --git a/src/views/system/trainingItem/index.vue b/src/views/system/trainingItem/index.vue index 77c4289..ad98904 100644 --- a/src/views/system/trainingItem/index.vue +++ b/src/views/system/trainingItem/index.vue @@ -40,8 +40,16 @@ - 搜索 - 重置 + 搜索 + 重置 @@ -54,7 +62,8 @@ size="mini" @click="handleAdd" v-hasPermi="['system:trainingItem:add']" - >新增 + >新增 修改 + >修改 删除 + >删除 - + - - - - - - + + + + + + + + @@ -156,8 +266,16 @@ width="180" > --> - - + + @@ -199,14 +319,22 @@ label-width="80px" :inline="true" > - + - + - 搜索 - 重置 + 搜索 + 重置 @@ -247,8 +383,16 @@ align="center" :show-overflow-tooltip="true" > - - + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + 新增 + + + 修改 + + + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 确 定 + 取 消 +
+ + + + + From 4875241c4a13e2dc66f7b8ccc59d135befe71453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Sat, 6 May 2023 10:35:07 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/playRecordStatistics/index.vue | 206 +++++++++++++----- 1 file changed, 146 insertions(+), 60 deletions(-) diff --git a/src/views/system/playRecordStatistics/index.vue b/src/views/system/playRecordStatistics/index.vue index cff9487..3a480ac 100644 --- a/src/views/system/playRecordStatistics/index.vue +++ b/src/views/system/playRecordStatistics/index.vue @@ -1,6 +1,13 @@ --> - + - + - + - - + + - + - - + + - + - + - + - - + + placeholder="请选择播放时间，格式：yyyy-MM-dd HH:mm:ss" + > - + placeholder="请选择播放日期，格式：yyyy-MM-dd" + > @@ -225,7 +296,13 @@ From ba7cced55852f53b05f320e0073f1eb868475c3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Sat, 6 May 2023 14:24:48 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/trainingItem/index.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/system/trainingItem/index.vue b/src/views/system/trainingItem/index.vue index 89869ce..6215a9e 100644 --- a/src/views/system/trainingItem/index.vue +++ b/src/views/system/trainingItem/index.vue @@ -117,7 +117,7 @@ - + /> --> Date: Sat, 6 May 2023 16:49:56 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/InformationCategory/index.vue | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/views/system/InformationCategory/index.vue b/src/views/system/InformationCategory/index.vue index d02698b..34dec3b 100644 --- a/src/views/system/InformationCategory/index.vue +++ b/src/views/system/InformationCategory/index.vue @@ -25,6 +25,21 @@ @keyup.enter.native="handleQuery" /> + + + + + + + {{ scope.row.informationCategoryType == "NURSING_NEWS" ? "护理新闻" : "" }} From c860e84d6fbe2ac670e4f3111a3cf3fb983d81d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Sat, 6 May 2023 17:37:18 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/InformationCategory/index.vue | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/src/views/system/InformationCategory/index.vue b/src/views/system/InformationCategory/index.vue index 34dec3b..2996346 100644 --- a/src/views/system/InformationCategory/index.vue +++ b/src/views/system/InformationCategory/index.vue @@ -26,20 +26,20 @@ /> - + - - - - + + + - - + + - 搜索 - 重置 + 搜索 + 重置 - + - + ] - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + - - + +
{{ form.nursePersonName }}
 @@ -283,249 +134,126 @@
{{ form.trainingOrderTime }}
 - - - + + + - + - - - + + +
{{ formlist.trainingItemDetails }}
 - - + " prop="trainingItemContent" v-if=" + formlist.trainingItemType == 'GRAPHIC_LEARNING' || + formlist.trainingItemType == 'LEARNING_ITEM_GROUP' +"> + - + - + - - + + - + - + - 搜索 - 重置 + 搜索 + 重置 - + - - - - + + + + - + - -