From dec4bc7c35e0edbe137dc39d2737048f67fd5f4a Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 10 Feb 2026 09:18:56 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 8 +-
.env.development2 | 8 +-
.env.development3 | 8 +-
.env.production | 8 +-
.../jeecg/components/JImageUploadToOpe.vue | 6 +-
.../NuResourcesManagement.api.ts | 72 +++++++
.../NuResourcesManagement.data.ts | 50 +++++
.../NuResourcesManagementList.vue | 91 ++++++++
.../NuResourcesManagementListModal.vue | 70 +++++++
.../components/NuResourcesManagementForm.vue | 197 ++++++++++++++++++
.../components/NuResourcesManagementModal.vue | 82 ++++++++
.../eldertag/components/ElderTagForm.vue | 48 +++--
.../eldertag/components/ElderTagModal.vue | 6 +-
.../NuConfigSuppliersApplyDetailForm.vue | 5 +-
.../components/NuConfigSuppliersApplyForm.vue | 2 +-
15 files changed, 622 insertions(+), 39 deletions(-)
create mode 100644 src/views/admin/resourcesManagement/NuResourcesManagement.api.ts
create mode 100644 src/views/admin/resourcesManagement/NuResourcesManagement.data.ts
create mode 100644 src/views/admin/resourcesManagement/NuResourcesManagementList.vue
create mode 100644 src/views/admin/resourcesManagement/NuResourcesManagementListModal.vue
create mode 100644 src/views/admin/resourcesManagement/components/NuResourcesManagementForm.vue
create mode 100644 src/views/admin/resourcesManagement/components/NuResourcesManagementModal.vue
diff --git a/.env.development b/.env.development
index d756bfb..436c5cd 100644
--- a/.env.development
+++ b/.env.development
@@ -23,10 +23,10 @@ VITE_APP_SUB_jeecg-app-1 = '//localhost:8091'
# 管理平台静态资源路径
VITE_OPE_MEDIA_ADDRESS = 'https://www.focusnu.com/media/'
-# 长者标签-体型标签默认图片
-VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'default/bodyDefault.png'
-# 长者标签-情绪标签默认图片
-VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'default/emoDefault.png'
+# 长者标签-标签默认图片
+VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'directive/index/index/moren.png'
+# 长者标签-标签焦点图片
+VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'directive/index/index/morencheck.png'
# 服务指令-服务指令图片(大)默认图片
VITE_DEFAULT_DIRECTIVE_PRE_PIC = 'default/predefault.png'
# 服务指令-服务指令图片(小)默认图片
diff --git a/.env.development2 b/.env.development2
index 06ffa31..f2d799a 100644
--- a/.env.development2
+++ b/.env.development2
@@ -23,10 +23,10 @@ VITE_APP_SUB_jeecg-app-1 = '//localhost:8092'
# 管理平台静态资源路径
VITE_OPE_MEDIA_ADDRESS = 'https://www.focusnu.com/media/upFiles/'
-# 长者标签-体型标签默认图片
-VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'default/bodyDefault.png'
-# 长者标签-情绪标签默认图片
-VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'default/emoDefault.png'
+# 长者标签-标签默认图片
+VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'directive/index/index/moren.png'
+# 长者标签-标签焦点图片
+VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'directive/index/index/morenCheck.png'
# 服务指令-服务指令图片(大)默认图片
VITE_DEFAULT_DIRECTIVE_PRE_PIC = 'default/predefault.png'
# 服务指令-服务指令图片(小)默认图片
diff --git a/.env.development3 b/.env.development3
index 22637e8..ed7bcf2 100644
--- a/.env.development3
+++ b/.env.development3
@@ -23,10 +23,10 @@ VITE_APP_SUB_jeecg-app-1 = '//localhost:8092'
# 管理平台静态资源路径
VITE_OPE_MEDIA_ADDRESS = 'https://www.focusnu.com/media/upFiles/'
-# 长者标签-体型标签默认图片
-VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'default/bodyDefault.png'
-# 长者标签-情绪标签默认图片
-VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'default/emoDefault.png'
+# 长者标签-标签默认图片
+VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'directive/index/index/moren.png'
+# 长者标签-标签焦点图片
+VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'directive/index/index/morenCheck.png'
# 服务指令-服务指令图片(大)默认图片
VITE_DEFAULT_DIRECTIVE_PRE_PIC = 'default/predefault.png'
# 服务指令-服务指令图片(小)默认图片
diff --git a/.env.production b/.env.production
index 259c15d..3122671 100644
--- a/.env.production
+++ b/.env.production
@@ -27,10 +27,10 @@ VITE_GLOB_API_URL_PREFIX=
# 管理平台静态资源路径
VITE_OPE_MEDIA_ADDRESS = 'https://www.focusnu.com/media/'
-# 长者标签-体型标签默认图片
-VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'default/bodyDefault.png'
-# 长者标签-情绪标签默认图片
-VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'default/emoDefault.png'
+# 长者标签-标签默认图片
+VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'directive/index/index/moren.png'
+# 长者标签-标签焦点图片
+VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'directive/index/index/morenCheck.png'
# 服务指令-服务指令图片(大)默认图片
VITE_DEFAULT_DIRECTIVE_PRE_PIC = 'default/predefault.png'
# 服务指令-服务指令图片(小)默认图片
diff --git a/src/components/Form/src/jeecg/components/JImageUploadToOpe.vue b/src/components/Form/src/jeecg/components/JImageUploadToOpe.vue
index b4a6538..e61e4df 100644
--- a/src/components/Form/src/jeecg/components/JImageUploadToOpe.vue
+++ b/src/components/Form/src/jeecg/components/JImageUploadToOpe.vue
@@ -2,7 +2,7 @@
+ :beforeUpload="beforeUpload" :disabled="disabled" @change="handleChange" @preview="handlePreview" :showUploadList="{showPreviewIcon:false}">
@@ -26,11 +26,11 @@
-->
-
-
+ -->
+
+
diff --git a/src/views/admin/resourcesManagement/NuResourcesManagementListModal.vue b/src/views/admin/resourcesManagement/NuResourcesManagementListModal.vue
new file mode 100644
index 0000000..a1075bb
--- /dev/null
+++ b/src/views/admin/resourcesManagement/NuResourcesManagementListModal.vue
@@ -0,0 +1,70 @@
+
+
+
+
+ 关闭
+ 确认
+
+
+
+
+
+
+
+
diff --git a/src/views/admin/resourcesManagement/components/NuResourcesManagementForm.vue b/src/views/admin/resourcesManagement/components/NuResourcesManagementForm.vue
new file mode 100644
index 0000000..07aeaf7
--- /dev/null
+++ b/src/views/admin/resourcesManagement/components/NuResourcesManagementForm.vue
@@ -0,0 +1,197 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/admin/resourcesManagement/components/NuResourcesManagementModal.vue b/src/views/admin/resourcesManagement/components/NuResourcesManagementModal.vue
new file mode 100644
index 0000000..2a85493
--- /dev/null
+++ b/src/views/admin/resourcesManagement/components/NuResourcesManagementModal.vue
@@ -0,0 +1,82 @@
+
+
+
+
+ 关闭
+ 确认
+
+
+
+
+
+
+
+
diff --git a/src/views/elder/eldertag/components/ElderTagForm.vue b/src/views/elder/eldertag/components/ElderTagForm.vue
index c4e397c..a840f26 100644
--- a/src/views/elder/eldertag/components/ElderTagForm.vue
+++ b/src/views/elder/eldertag/components/ElderTagForm.vue
@@ -1,6 +1,6 @@
-
+
@@ -29,21 +29,24 @@
-
-
-
-
+
-
-
-
-
-
+
diff --git a/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyDetailForm.vue b/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyDetailForm.vue
index 321deac..8a68068 100644
--- a/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyDetailForm.vue
+++ b/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyDetailForm.vue
@@ -23,7 +23,7 @@
-
+
@@ -67,6 +67,7 @@
+ 待审核
审核通过
审核驳回
待审核
@@ -74,7 +75,7 @@
-
+
diff --git a/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyForm.vue b/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyForm.vue
index 2a08889..4423ae6 100644
--- a/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyForm.vue
+++ b/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyForm.vue
@@ -23,7 +23,7 @@
-
+
From 8538bb0f53dade47ef9607351249b9c9e655ba97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Tue, 10 Feb 2026 10:07:19 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=AE=A1=E7=90=86-?=
=?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=AE=A1=E7=90=86=EF=BC=8C=E5=8E=86=E5=8F=B2?=
=?UTF-8?q?=E8=AF=A6=E6=83=85BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/admin/employeesapply/EmployeesAuditHistoryList.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/admin/employeesapply/EmployeesAuditHistoryList.vue b/src/views/admin/employeesapply/EmployeesAuditHistoryList.vue
index 8612bf9..bedeba2 100644
--- a/src/views/admin/employeesapply/EmployeesAuditHistoryList.vue
+++ b/src/views/admin/employeesapply/EmployeesAuditHistoryList.vue
@@ -138,7 +138,7 @@ function handleDetail(record: Recordable) {
if(record.applyType == '2'){
registerModal.value.disableSubmit = true;
registerModal.value.edit(record);
- }else if(record.applyType == '1'){
+ }else if(record.applyType == '1' || record.applyType == '0'){
registerModal.value.disableSubmit = true;
registerModal.value.editDitail(record);
}else{
From 656297179c7127c2d9287fe27058f719230493a6 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 10 Feb 2026 15:06:28 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development2 | 2 +-
.env.development3 | 2 +-
.env.production | 2 +-
.../Form/src/jeecg/components/JUpload/JUploadMP3.vue | 4 ++--
.../Form/src/jeecg/components/JUpload/JUploadMP4.vue | 4 ++--
.../admin/resourcesManagement/NuResourcesManagementList.vue | 2 +-
src/views/elder/eldertag/components/ElderTagForm.vue | 4 ++--
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.env.development2 b/.env.development2
index f2d799a..9196a44 100644
--- a/.env.development2
+++ b/.env.development2
@@ -26,7 +26,7 @@ VITE_OPE_MEDIA_ADDRESS = 'https://www.focusnu.com/media/upFiles/'
# 长者标签-标签默认图片
VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'directive/index/index/moren.png'
# 长者标签-标签焦点图片
-VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'directive/index/index/morenCheck.png'
+VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'directive/index/index/morencheck.png'
# 服务指令-服务指令图片(大)默认图片
VITE_DEFAULT_DIRECTIVE_PRE_PIC = 'default/predefault.png'
# 服务指令-服务指令图片(小)默认图片
diff --git a/.env.development3 b/.env.development3
index ed7bcf2..baf01f3 100644
--- a/.env.development3
+++ b/.env.development3
@@ -26,7 +26,7 @@ VITE_OPE_MEDIA_ADDRESS = 'https://www.focusnu.com/media/upFiles/'
# 长者标签-标签默认图片
VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'directive/index/index/moren.png'
# 长者标签-标签焦点图片
-VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'directive/index/index/morenCheck.png'
+VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'directive/index/index/morencheck.png'
# 服务指令-服务指令图片(大)默认图片
VITE_DEFAULT_DIRECTIVE_PRE_PIC = 'default/predefault.png'
# 服务指令-服务指令图片(小)默认图片
diff --git a/.env.production b/.env.production
index 3122671..77764ec 100644
--- a/.env.production
+++ b/.env.production
@@ -30,7 +30,7 @@ VITE_OPE_MEDIA_ADDRESS = 'https://www.focusnu.com/media/'
# 长者标签-标签默认图片
VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'directive/index/index/moren.png'
# 长者标签-标签焦点图片
-VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'directive/index/index/morenCheck.png'
+VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'directive/index/index/morencheck.png'
# 服务指令-服务指令图片(大)默认图片
VITE_DEFAULT_DIRECTIVE_PRE_PIC = 'default/predefault.png'
# 服务指令-服务指令图片(小)默认图片
diff --git a/src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue b/src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue
index 17f54a4..ee7b64a 100644
--- a/src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue
+++ b/src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue
@@ -37,9 +37,9 @@
-
+
diff --git a/src/components/Form/src/jeecg/components/JUpload/JUploadMP4.vue b/src/components/Form/src/jeecg/components/JUpload/JUploadMP4.vue
index 67edbb3..0526ad2 100644
--- a/src/components/Form/src/jeecg/components/JUpload/JUploadMP4.vue
+++ b/src/components/Form/src/jeecg/components/JUpload/JUploadMP4.vue
@@ -40,9 +40,9 @@
您的浏览器不支持视频播放
-
+
diff --git a/src/views/admin/resourcesManagement/NuResourcesManagementList.vue b/src/views/admin/resourcesManagement/NuResourcesManagementList.vue
index 48307a1..a3edc0c 100644
--- a/src/views/admin/resourcesManagement/NuResourcesManagementList.vue
+++ b/src/views/admin/resourcesManagement/NuResourcesManagementList.vue
@@ -45,7 +45,7 @@
function open() {
- defHttp.get({ url: '/resourcesManagement/nuResourcesManagement/list', params: { pageSize: -1,resourcesType:'1' } }).then(res => {
+ defHttp.get({ url: '/resourcesManagement/nuResourcesManagement/list', params: { pageSize: -1,resourcesType:'1',fileType:'image' } }).then(res => {
console.log("🚀 ~ open ~ res:", res)
dataList.value = res.records;
diff --git a/src/views/elder/eldertag/components/ElderTagForm.vue b/src/views/elder/eldertag/components/ElderTagForm.vue
index a840f26..02555cb 100644
--- a/src/views/elder/eldertag/components/ElderTagForm.vue
+++ b/src/views/elder/eldertag/components/ElderTagForm.vue
@@ -19,7 +19,7 @@
+ :autosize="{ minRows: 3 }" :showCount="true" />
@@ -159,7 +159,7 @@ const disabled = computed(() => {
* 新增
*/
function add() {
- edit({pic:'',pic});
+ edit({});
}
/**
From 03d004c4c683b6cd0f8196783d7edbd7538a29bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Tue, 10 Feb 2026 16:03:22 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=AE=A1=E7=90=86-?=
=?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=AE=A1=E7=90=86=EF=BC=8C=E5=8E=86=E5=8F=B2?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AE=A1=E6=89=B9=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/employeesapply/components/EmployeesApplyDetailForm.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/admin/employeesapply/components/EmployeesApplyDetailForm.vue b/src/views/admin/employeesapply/components/EmployeesApplyDetailForm.vue
index ad0e60b..64b6313 100644
--- a/src/views/admin/employeesapply/components/EmployeesApplyDetailForm.vue
+++ b/src/views/admin/employeesapply/components/EmployeesApplyDetailForm.vue
@@ -270,6 +270,7 @@
+ 待审核
审核通过
审核驳回