From f9faa34486e1e4f8c9e5f6fe9666e2d4f475f3f8 Mon Sep 17 00:00:00 2001
From: lcj <2331845269@qq.com>
Date: Fri, 14 Mar 2025 18:19:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=91=98=E3=80=81?=
 =?UTF-8?q?=E6=9D=90=E6=96=99=E3=80=81=E6=9C=BA=E6=A2=B0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E3=80=81=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/vo/BusMachineryDetailVo.java       |   7 +
 .../impl/BusMachineryDetailServiceImpl.java   |  15 ++
 .../materials/domain/BusMaterials.java        |  44 +---
 .../req/materials/MaterialsCreateReq.java     |  45 +---
 .../req/materials/MaterialsQueryReq.java      |  11 +
 .../req/materials/MaterialsUpdateReq.java     |  45 +---
 .../materials/domain/vo/BusMaterialsVo.java   |  54 +----
 .../service/IBusMaterialsService.java         |   4 +-
 .../service/impl/BusMaterialsServiceImpl.java |  40 +++-
 .../project/domain/BusConstructionUser.java   |  22 +-
 .../ConstructionUserCreateReq.java            |  22 +-
 .../ConstructionUserUpdateReq.java            |  22 +-
 .../domain/vo/BusConstructionUserVo.java      |  30 ++-
 .../impl/BusProjectTeamMemberServiceImpl.java |   2 +-
 RuoYi-Vue-Plus/script/sql/xinnengyuan.sql     |  42 ++--
 plus-ui/.env.development                      |   2 +-
 plus-ui/.env.production                       |   2 +-
 plus-ui/index.html                            |   2 +-
 .../api/machinery/machineryDetail/types.ts    |   7 +
 plus-ui/src/api/materials/materials/types.ts  | 132 +----------
 .../src/api/project/constructionUser/types.ts |  49 ++++-
 plus-ui/src/api/project/contractor/types.ts   |  10 +
 .../src/layout/components/Sidebar/Logo.vue    |   2 +-
 plus-ui/src/views/login.vue                   |   2 +-
 .../component/MachineryDetailAddDialog.vue    |   3 +-
 .../component/MachineryDetailTable.vue        |   6 +-
 .../src/views/materials/materials/index.vue   | 134 ++++++------
 .../views/project/constructionUser/index.vue  |  27 ++-
 .../component/ContractorFileDialog.vue        |  92 ++++++++
 .../src/views/project/contractor/index.vue    |  27 ++-
 plus-ui/src/views/project/project/index.vue   |  23 +-
 .../projectTeam/component/UserListDialog.vue  | 207 ++++++++----------
 .../src/views/project/projectTeam/index.vue   |  17 +-
 plus-ui/src/views/register.vue                |   2 +-
 34 files changed, 564 insertions(+), 587 deletions(-)
 create mode 100644 plus-ui/src/views/project/contractor/component/ContractorFileDialog.vue

diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/BusMachineryDetailVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/BusMachineryDetailVo.java
index b01f9520..ad260205 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/BusMachineryDetailVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/BusMachineryDetailVo.java
@@ -7,10 +7,12 @@ import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.machinery.domain.BusMachineryDetail;
+import org.dromara.system.domain.vo.SysOssVo;
 
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -82,6 +84,11 @@ public class BusMachineryDetailVo implements Serializable {
     @ExcelProperty(value = "图片(英文逗号分隔)")
     private String picture;
 
+    /**
+     * 图片详情列表
+     */
+    private List<SysOssVo> pictureList;
+
     /**
      * 机械主键id
      */
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryDetailServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryDetailServiceImpl.java
index f2008348..0740f580 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryDetailServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryDetailServiceImpl.java
@@ -23,10 +23,13 @@ import org.dromara.machinery.mapper.BusMachineryDetailMapper;
 import org.dromara.machinery.service.IBusMachineryDetailService;
 import org.dromara.machinery.service.IBusMachineryService;
 import org.dromara.project.service.IBusProjectService;
+import org.dromara.system.domain.vo.SysOssVo;
+import org.dromara.system.service.ISysOssService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
@@ -47,6 +50,9 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
     @Resource
     private IBusProjectService projectService;
 
+    @Resource
+    private ISysOssService ossService;
+
     /**
      * 查询机械详情
      *
@@ -191,6 +197,15 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
             return machineryDetailVo;
         }
         BeanUtils.copyProperties(machineryDetail, machineryDetailVo);
+        // 获取图片信息
+        String picture = machineryDetail.getPicture();
+        if (StringUtils.isNotEmpty(picture)) {
+            List<Long> picList = Arrays.stream(picture.split(","))
+                .map(Long::parseLong)
+                .toList();
+            List<SysOssVo> pictureList = ossService.listByIds(picList);
+            machineryDetailVo.setPictureList(pictureList);
+        }
         return machineryDetailVo;
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusMaterials.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusMaterials.java
index 01e914ab..049a9066 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusMaterials.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusMaterials.java
@@ -51,49 +51,9 @@ public class BusMaterials extends BaseEntity {
     private String typeSpecificationName;
 
     /**
-     * 规格型号文件路径
+     * 文件对象存储id列表
      */
-    private String typeSpecificationUrl;
-
-    /**
-     * 合格证编号名称
-     */
-    private String certificateConformityName;
-
-    /**
-     * 合格证编号文件路径
-     */
-    private String certificateConformityUrl;
-
-    /**
-     * 质量说明书编号
-     */
-    private String qualityName;
-
-    /**
-     * 质量说明书文件路径
-     */
-    private String qualityUrl;
-
-    /**
-     * 检验报告编号
-     */
-    private String inspectionReportName;
-
-    /**
-     * 检验报告文件路径
-     */
-    private String inspectionReportUrl;
-
-    /**
-     * 复试报告编号
-     */
-    private String reexamineReportName;
-
-    /**
-     * 复试报告文件路径
-     */
-    private String reexamineReportUrl;
+    private String fileOssId;
 
     /**
      * 使用部位
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsCreateReq.java
index 6322f0db..10f6bd96 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsCreateReq.java
@@ -4,6 +4,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * @author lcj
@@ -36,49 +37,9 @@ public class MaterialsCreateReq implements Serializable {
     private String typeSpecificationName;
 
     /**
-     * 规格型号文件路径
+     * 文件对象存储id列表
      */
-    private String typeSpecificationUrl;
-
-    /**
-     * 合格证编号名称
-     */
-    private String certificateConformityName;
-
-    /**
-     * 合格证编号文件路径
-     */
-    private String certificateConformityUrl;
-
-    /**
-     * 质量说明书编号
-     */
-    private String qualityName;
-
-    /**
-     * 质量说明书文件路径
-     */
-    private String qualityUrl;
-
-    /**
-     * 检验报告编号
-     */
-    private String inspectionReportName;
-
-    /**
-     * 检验报告文件路径
-     */
-    private String inspectionReportUrl;
-
-    /**
-     * 复试报告编号
-     */
-    private String reexamineReportName;
-
-    /**
-     * 复试报告文件路径
-     */
-    private String reexamineReportUrl;
+    private Map<String, Long> fileOssIdMap;
 
     /**
      * 使用部位
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsQueryReq.java
index cdd63737..91515a7d 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsQueryReq.java
@@ -6,6 +6,7 @@ import org.dromara.common.core.common.PageRequest;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * @author lcj
@@ -38,6 +39,16 @@ public class MaterialsQueryReq extends PageRequest implements Serializable {
      */
     private Long projectId;
 
+    /**
+     * 规格型号名称
+     */
+    private String typeSpecificationName;
+
+    /**
+     * 文件对象存储id列表
+     */
+    private Map<String, Long> fileOssIdMap;
+
     /**
      * 使用部位
      */
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsUpdateReq.java
index 1a9b2975..370e4537 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsUpdateReq.java
@@ -4,6 +4,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * @author lcj
@@ -41,49 +42,9 @@ public class MaterialsUpdateReq implements Serializable {
     private String typeSpecificationName;
 
     /**
-     * 规格型号文件路径
+     * 文件对象存储id列表
      */
-    private String typeSpecificationUrl;
-
-    /**
-     * 合格证编号名称
-     */
-    private String certificateConformityName;
-
-    /**
-     * 合格证编号文件路径
-     */
-    private String certificateConformityUrl;
-
-    /**
-     * 质量说明书编号
-     */
-    private String qualityName;
-
-    /**
-     * 质量说明书文件路径
-     */
-    private String qualityUrl;
-
-    /**
-     * 检验报告编号
-     */
-    private String inspectionReportName;
-
-    /**
-     * 检验报告文件路径
-     */
-    private String inspectionReportUrl;
-
-    /**
-     * 复试报告编号
-     */
-    private String reexamineReportName;
-
-    /**
-     * 复试报告文件路径
-     */
-    private String reexamineReportUrl;
+    private Map<String, Long> fileOssIdMap;
 
     /**
      * 使用部位
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsVo.java
index d4fe4a37..8568cad0 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsVo.java
@@ -10,6 +10,7 @@ import org.dromara.materials.domain.BusMaterials;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.Map;
 
 
 /**
@@ -63,58 +64,9 @@ public class BusMaterialsVo implements Serializable {
     private String typeSpecificationName;
 
     /**
-     * 规格型号文件路径
+     * 文件详情列表
      */
-    @ExcelProperty(value = "规格型号文件路径")
-    private String typeSpecificationUrl;
-
-    /**
-     * 合格证编号名称
-     */
-    @ExcelProperty(value = "合格证编号名称")
-    private String certificateConformityName;
-
-    /**
-     * 合格证编号文件路径
-     */
-    @ExcelProperty(value = "合格证编号文件路径")
-    private String certificateConformityUrl;
-
-    /**
-     * 质量说明书编号
-     */
-    @ExcelProperty(value = "质量说明书编号")
-    private String qualityName;
-
-    /**
-     * 质量说明书文件路径
-     */
-    @ExcelProperty(value = "质量说明书文件路径")
-    private String qualityUrl;
-
-    /**
-     * 检验报告编号
-     */
-    @ExcelProperty(value = "检验报告编号")
-    private String inspectionReportName;
-
-    /**
-     * 检验报告文件路径
-     */
-    @ExcelProperty(value = "检验报告文件路径")
-    private String inspectionReportUrl;
-
-    /**
-     * 复试报告编号
-     */
-    @ExcelProperty(value = "复试报告编号")
-    private String reexamineReportName;
-
-    /**
-     * 复试报告文件路径
-     */
-    @ExcelProperty(value = "复试报告文件路径")
-    private String reexamineReportUrl;
+    private Map<String, Long> fileOssMap;
 
     /**
      * 使用部位
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsService.java
index 4a8d90c0..74c0a0d7 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsService.java
@@ -72,10 +72,10 @@ public interface IBusMaterialsService extends IService<BusMaterials> {
     /**
      * 获取材料视图
      *
-     * @param Materials 材料
+     * @param materials 材料
      * @return 材料视图
      */
-    BusMaterialsVo getBusMaterialsVo(BusMaterials Materials);
+    BusMaterialsVo getBusMaterialsVo(BusMaterials materials);
 
     /**
      * 构建查询条件封装
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsServiceImpl.java
index b4fcd720..3dea18e5 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsServiceImpl.java
@@ -2,6 +2,8 @@ package org.dromara.materials.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,6 +15,7 @@ import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.ObjectUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.sql.SqlUtil;
+import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.materials.domain.BusMaterials;
 import org.dromara.materials.domain.BusMaterialsInventory;
@@ -30,7 +33,9 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 材料名称Service业务层处理
@@ -64,7 +69,11 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
      */
     @Override
     public BusMaterialsVo queryById(Long id) {
-        return baseMapper.selectVoById(id);
+        BusMaterials materials = this.getById(id);
+        if (materials == null) {
+            throw new ServiceException("材料名称信息不存在", HttpStatus.NOT_FOUND);
+        }
+        return this.getBusMaterialsVo(materials);
     }
 
     /**
@@ -105,6 +114,10 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
         // 将实体类和 DTO 进行转换
         BusMaterials materials = new BusMaterials();
         BeanUtils.copyProperties(req, materials);
+        // 数据转换
+        Map<String, Long> fileOssIdList = req.getFileOssIdMap();
+        String fileOssIdStr = JsonUtils.toJsonString(fileOssIdList);
+        materials.setFileOssId(fileOssIdStr);
         // 数据校验
         validEntityBeforeSave(materials);
         // 写入数据库
@@ -127,6 +140,10 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
         // 将实体类和 DTO 进行转换
         BusMaterials materials = new BusMaterials();
         BeanUtils.copyProperties(req, materials);
+        // 数据转换
+        Map<String, Long> fileOssIdList = req.getFileOssIdMap();
+        String fileOssIdStr = JSONUtil.toJsonStr(fileOssIdList);
+        materials.setFileOssId(fileOssIdStr);
         // 数据校验
         validEntityBeforeSave(materials);
         // 判断是否存在
@@ -196,22 +213,31 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
     /**
      * 获取材料视图
      *
-     * @param Materials 材料
+     * @param materials 材料
      * @return 材料视图
      */
     @Override
-    public BusMaterialsVo getBusMaterialsVo(BusMaterials Materials) {
+    public BusMaterialsVo getBusMaterialsVo(BusMaterials materials) {
         // 对象转封装类
         BusMaterialsVo materialsVo = new BusMaterialsVo();
-        if (Materials == null) {
+        if (materials == null) {
             return materialsVo;
         }
-        BeanUtils.copyProperties(Materials, materialsVo);
+        BeanUtils.copyProperties(materials, materialsVo);
         // 关联查询项目信息
-        Long companyId = Materials.getCompanyId();
+        Long companyId = materials.getCompanyId();
         if (companyId != null) {
             materialsVo.setCompanyVo(companyService.queryById(companyId));
         }
+        // 关联对象存储文件信息
+        String fileOssId = materials.getFileOssId();
+        if (StringUtils.isEmpty(fileOssId)) {
+            return materialsVo;
+        }
+        Map<String, Long> fileOssMap = new HashMap<>();
+        JSONObject parseObj = JSONUtil.parseObj(fileOssId);
+        parseObj.forEach((key, value) -> fileOssMap.put(key, (Long) value));
+        materialsVo.setFileOssMap(fileOssMap);
         return materialsVo;
     }
 
@@ -232,6 +258,7 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
         String materialsName = req.getMaterialsName();
         Long companyId = req.getCompanyId();
         Long projectId = req.getProjectId();
+        String typeSpecificationName = req.getTypeSpecificationName();
         String usePart = req.getUsePart();
         String weightId = req.getWeightId();
         String remark = req.getRemark();
@@ -242,6 +269,7 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
         String underlineSortField = StrUtil.toUnderlineCase(sortField);
         // 模糊查询
         queryWrapper.like(StringUtils.isNotBlank(materialsName), "materials_name", materialsName);
+        queryWrapper.like(StringUtils.isNotBlank(typeSpecificationName), "type_specification_name", typeSpecificationName);
         queryWrapper.like(StringUtils.isNotBlank(usePart), "use_part", usePart);
         queryWrapper.like(StringUtils.isNotBlank(remark), "remark", remark);
         queryWrapper.like(StringUtils.isNotBlank(weightId), "weight_id", weightId);
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusConstructionUser.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusConstructionUser.java
index 55e6933e..0827e365 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusConstructionUser.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusConstructionUser.java
@@ -43,7 +43,7 @@ public class BusConstructionUser extends BaseEntity {
     /**
      * 人脸照
      */
-    private String pacePhoto;
+    private String facePic;
 
     /**
      * 人员姓名
@@ -90,6 +90,16 @@ public class BusConstructionUser extends BaseEntity {
      */
     private String nation;
 
+    /**
+     * 身份证正面图片
+     */
+    private String sfzFrontPic;
+
+    /**
+     * 身份证反面图片
+     */
+    private String sfzBackPic;
+
     /**
      * 身份证号码
      */
@@ -120,6 +130,11 @@ public class BusConstructionUser extends BaseEntity {
      */
     private String nativePlace;
 
+    /**
+     * 银行卡图片
+     */
+    private String yhkPic;
+
     /**
      * 银行卡号
      */
@@ -140,6 +155,11 @@ public class BusConstructionUser extends BaseEntity {
      */
     private String typeOfWork;
 
+    /**
+     * 特种工作证图片
+     */
+    private String specialWorkPic;
+
     /**
      * 打卡(0启用打卡 1禁止打卡)
      */
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserCreateReq.java
index 5cd8d08c..547f77dc 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserCreateReq.java
@@ -28,7 +28,7 @@ public class ConstructionUserCreateReq implements Serializable {
     /**
      * 人脸照
      */
-    private String pacePhoto;
+    private String facePic;
 
     /**
      * 人员姓名
@@ -75,6 +75,16 @@ public class ConstructionUserCreateReq implements Serializable {
      */
     private String nation;
 
+    /**
+     * 身份证正面图片
+     */
+    private String sfzFrontPic;
+
+    /**
+     * 身份证反面图片
+     */
+    private String sfzBackPic;
+
     /**
      * 身份证号码
      */
@@ -105,6 +115,11 @@ public class ConstructionUserCreateReq implements Serializable {
      */
     private String nativePlace;
 
+    /**
+     * 银行卡图片
+     */
+    private String yhkPic;
+
     /**
      * 银行卡号
      */
@@ -125,6 +140,11 @@ public class ConstructionUserCreateReq implements Serializable {
      */
     private String typeOfWork;
 
+    /**
+     * 特种工作证图片
+     */
+    private String specialWorkPic;
+
     /**
      * 打卡(0启用打卡 1禁止打卡)
      */
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserUpdateReq.java
index 14a81a54..b37236ab 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserUpdateReq.java
@@ -33,7 +33,7 @@ public class ConstructionUserUpdateReq implements Serializable {
     /**
      * 人脸照
      */
-    private String pacePhoto;
+    private String facePic;
 
     /**
      * 人员姓名
@@ -80,6 +80,16 @@ public class ConstructionUserUpdateReq implements Serializable {
      */
     private String nation;
 
+    /**
+     * 身份证正面图片
+     */
+    private String sfzFrontPic;
+
+    /**
+     * 身份证反面图片
+     */
+    private String sfzBackPic;
+
     /**
      * 身份证号码
      */
@@ -110,6 +120,11 @@ public class ConstructionUserUpdateReq implements Serializable {
      */
     private String nativePlace;
 
+    /**
+     * 银行卡图片
+     */
+    private String yhkPic;
+
     /**
      * 银行卡号
      */
@@ -130,6 +145,11 @@ public class ConstructionUserUpdateReq implements Serializable {
      */
     private String typeOfWork;
 
+    /**
+     * 特种工作证图片
+     */
+    private String specialWorkPic;
+
     /**
      * 打卡(0启用打卡 1禁止打卡)
      */
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserVo.java
index 6054b7cf..f1dc6a5a 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserVo.java
@@ -48,7 +48,7 @@ public class BusConstructionUserVo implements Serializable {
      * 人脸照
      */
     @ExcelProperty(value = "人脸照")
-    private String pacePhoto;
+    private String facePic;
 
     /**
      * 人员姓名
@@ -111,6 +111,18 @@ public class BusConstructionUserVo implements Serializable {
     @ExcelProperty(value = "民族")
     private String nation;
 
+    /**
+     * 身份证正面图片
+     */
+    @ExcelProperty(value = "身份证正面图片")
+    private String sfzFrontPic;
+
+    /**
+     * 身份证反面图片
+     */
+    @ExcelProperty(value = "身份证反面图片")
+    private String sfzBackPic;
+
     /**
      * 身份证号码
      */
@@ -147,6 +159,12 @@ public class BusConstructionUserVo implements Serializable {
     @ExcelProperty(value = "籍贯")
     private String nativePlace;
 
+    /**
+     * 银行卡图片
+     */
+    @ExcelProperty(value = "银行卡图片")
+    private String yhkPic;
+
     /**
      * 银行卡号
      */
@@ -166,12 +184,18 @@ public class BusConstructionUserVo implements Serializable {
     private String yhkCardholder;
 
     /**
-     * 工种(字典type_of_work)
+     * 工种
      */
-    @ExcelProperty(value = "工种(字典type_of_work)", converter = ExcelDictConvert.class)
+    @ExcelProperty(value = "工种", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "type_of_work")
     private String typeOfWork;
 
+    /**
+     * 特种工作证图片
+     */
+    @ExcelProperty(value = "特种工作证图片")
+    private String specialWorkPic;
+
     /**
      * 打卡(0启用打卡 1禁止打卡)
      */
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
index 8f69fd9e..da706559 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
@@ -116,7 +116,7 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
         BusProjectTeamMember teamMember = this.getOne(new LambdaQueryWrapper<BusProjectTeamMember>()
             .eq(BusProjectTeamMember::getMemberId, projectTeamMember.getMemberId()));
         if (teamMember != null) {
-            throw new ServiceException("当前用户以关联编号为：" + teamMember.getTeamId() + "的班组", HttpStatus.CONFLICT);
+            throw new ServiceException("当前用户已关联编号为：" + teamMember.getTeamId() + "的班组", HttpStatus.CONFLICT);
         }
         // 操作数据库
         boolean save = this.save(projectTeamMember);
diff --git a/RuoYi-Vue-Plus/script/sql/xinnengyuan.sql b/RuoYi-Vue-Plus/script/sql/xinnengyuan.sql
index 2a83bfa3..60006705 100644
--- a/RuoYi-Vue-Plus/script/sql/xinnengyuan.sql
+++ b/RuoYi-Vue-Plus/script/sql/xinnengyuan.sql
@@ -80,31 +80,23 @@ CREATE TABLE `bus_company`
 DROP TABLE IF EXISTS `bus_materials`;
 CREATE TABLE `bus_materials`
 (
-    `id`                          bigint                               not null auto_increment,
-    `materials_name`              varchar(64)                          null comment '材料名称',
-    `company_id`                  bigint                               null comment '公司id',
-    `project_id`                  bigint                               null comment '项目id',
-    `type_specification_name`     varchar(64)                          null comment '规格型号名称',
-    `type_specification_url`      varchar(255)                         null comment '规格型号文件路径',
-    `certificate_conformity_name` varchar(64)                          null comment '合格证编号名称',
-    `certificate_conformity_url`  varchar(255)                         null comment '合格证编号文件路径',
-    `quality_name`                varchar(64)                          null comment '质量说明书编号',
-    `quality_url`                 varchar(255)                         null comment '质量说明书文件路径',
-    `inspection_report_name`      varchar(64)                          null comment '检验报告编号',
-    `inspection_report_url`       varchar(255)                         null comment '检验报告文件路径',
-    `reexamine_report_name`       varchar(64)                          null comment '复试报告编号',
-    `reexamine_report_url`        varchar(255)                         null comment '复试报告文件路径',
-    `use_part`                    varchar(64)                          null comment '使用部位',
-    `weight_id`                   varchar(64)                          null comment '计量单位',
-    `remark`                      varchar(255)                         null comment '备注',
-    `quantity_count`              varchar(64)                          null comment '预计材料数量',
-    `status`                      char(1)    default '0'               null comment '状态（0正常 1停用）',
-    `create_by`                   varchar(64)                          null comment '创建者',
-    `update_by`                   varchar(64)                          null comment '更新者',
-    `create_time`                 datetime   default CURRENT_TIMESTAMP null comment '创建时间',
-    `update_time`                 datetime   default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间',
-    `deleted_at`                  datetime                             null comment '删除时间',
-    `is_delete`                   tinyint(4) default 0                 not null comment '是否删除（0正常 1删除）',
+    `id`                      bigint                               not null auto_increment,
+    `materials_name`          varchar(64)                          null comment '材料名称',
+    `company_id`              bigint                               null comment '公司id',
+    `project_id`              bigint                               null comment '项目id',
+    `type_specification_name` varchar(64)                          null comment '规格型号名称',
+    `file_url`                varchar(1024)                        null comment '文件地址列表(字典materials_file_type)',
+    `use_part`                varchar(64)                          null comment '使用部位',
+    `weight_id`               varchar(64)                          null comment '计量单位',
+    `remark`                  varchar(255)                         null comment '备注',
+    `quantity_count`          varchar(64)                          null comment '预计材料数量',
+    `status`                  char(1)    default '0'               null comment '状态（0正常 1停用）',
+    `create_by`               varchar(64)                          null comment '创建者',
+    `update_by`               varchar(64)                          null comment '更新者',
+    `create_time`             datetime   default CURRENT_TIMESTAMP null comment '创建时间',
+    `update_time`             datetime   default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间',
+    `deleted_at`              datetime                             null comment '删除时间',
+    `is_delete`               tinyint(4) default 0                 not null comment '是否删除（0正常 1删除）',
     PRIMARY KEY (`id`) USING BTREE,
     INDEX `idx_project_id` (`project_id` ASC) USING BTREE comment '项目id'
 ) ENGINE = InnoDB
diff --git a/plus-ui/.env.development b/plus-ui/.env.development
index 94f3f5ac..e5ac0551 100644
--- a/plus-ui/.env.development
+++ b/plus-ui/.env.development
@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
+VITE_APP_TITLE = 新能源项目管理平台
 
 # 开发环境配置
 VITE_APP_ENV = 'development'
diff --git a/plus-ui/.env.production b/plus-ui/.env.production
index 5cd51d22..0eb59247 100644
--- a/plus-ui/.env.production
+++ b/plus-ui/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
+VITE_APP_TITLE = 新能源项目管理平台
 
 # 生产环境配置
 VITE_APP_ENV = 'production'
diff --git a/plus-ui/index.html b/plus-ui/index.html
index aa1c86d9..8b09d746 100644
--- a/plus-ui/index.html
+++ b/plus-ui/index.html
@@ -6,7 +6,7 @@
     <meta name="renderer" content="webkit" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
     <link rel="icon" href="/favicon.ico" />
-    <title>RuoYi-Vue-Plus多租户管理系统</title>
+    <title>新能源项目管理平台</title>
     <!--[if lt IE 11
       ]><script>
         window.location.href = '/html/ie.html';
diff --git a/plus-ui/src/api/machinery/machineryDetail/types.ts b/plus-ui/src/api/machinery/machineryDetail/types.ts
index 1cffc503..10608e8e 100644
--- a/plus-ui/src/api/machinery/machineryDetail/types.ts
+++ b/plus-ui/src/api/machinery/machineryDetail/types.ts
@@ -1,3 +1,5 @@
+import { OssVO } from '@/api/system/oss/types';
+
 export interface MachineryDetailVO {
   /**
    * 主键id
@@ -44,6 +46,11 @@ export interface MachineryDetailVO {
    */
   picture: string;
 
+  /**
+   * 图片详情列表
+   */
+  pictureList: OssVO;
+
   /**
    * 机械主键id
    */
diff --git a/plus-ui/src/api/materials/materials/types.ts b/plus-ui/src/api/materials/materials/types.ts
index 5e63de13..117af841 100644
--- a/plus-ui/src/api/materials/materials/types.ts
+++ b/plus-ui/src/api/materials/materials/types.ts
@@ -32,49 +32,9 @@ export interface MaterialsVO {
   typeSpecificationName: string;
 
   /**
-   * 规格型号文件路径
+   * 文件详情列表
    */
-  typeSpecificationUrl: string;
-
-  /**
-   * 合格证编号名称
-   */
-  certificateConformityName: string;
-
-  /**
-   * 合格证编号文件路径
-   */
-  certificateConformityUrl: string;
-
-  /**
-   * 质量说明书编号
-   */
-  qualityName: string;
-
-  /**
-   * 质量说明书文件路径
-   */
-  qualityUrl: string;
-
-  /**
-   * 检验报告编号
-   */
-  inspectionReportName: string;
-
-  /**
-   * 检验报告文件路径
-   */
-  inspectionReportUrl: string;
-
-  /**
-   * 复试报告编号
-   */
-  reexamineReportName: string;
-
-  /**
-   * 复试报告文件路径
-   */
-  reexamineReportUrl: string;
+  fileOssMap: Record<string, string>;
 
   /**
    * 使用部位
@@ -129,49 +89,9 @@ export interface MaterialsForm extends BaseEntity {
   typeSpecificationName?: string;
 
   /**
-   * 规格型号文件路径
+   * 文件对象存储id列表
    */
-  typeSpecificationUrl?: string;
-
-  /**
-   * 合格证编号名称
-   */
-  certificateConformityName?: string;
-
-  /**
-   * 合格证编号文件路径
-   */
-  certificateConformityUrl?: string;
-
-  /**
-   * 质量说明书编号
-   */
-  qualityName?: string;
-
-  /**
-   * 质量说明书文件路径
-   */
-  qualityUrl?: string;
-
-  /**
-   * 检验报告编号
-   */
-  inspectionReportName?: string;
-
-  /**
-   * 检验报告文件路径
-   */
-  inspectionReportUrl?: string;
-
-  /**
-   * 复试报告编号
-   */
-  reexamineReportName?: string;
-
-  /**
-   * 复试报告文件路径
-   */
-  reexamineReportUrl?: string;
+  fileOssIdMap?: Record<string, string | number>;
 
   /**
    * 使用部位
@@ -221,49 +141,9 @@ export interface MaterialsQuery extends PageRequest {
   typeSpecificationName?: string;
 
   /**
-   * 规格型号文件路径
+   * 文件对象存储id列表
    */
-  typeSpecificationUrl?: string;
-
-  /**
-   * 合格证编号名称
-   */
-  certificateConformityName?: string;
-
-  /**
-   * 合格证编号文件路径
-   */
-  certificateConformityUrl?: string;
-
-  /**
-   * 质量说明书编号
-   */
-  qualityName?: string;
-
-  /**
-   * 质量说明书文件路径
-   */
-  qualityUrl?: string;
-
-  /**
-   * 检验报告编号
-   */
-  inspectionReportName?: string;
-
-  /**
-   * 检验报告文件路径
-   */
-  inspectionReportUrl?: string;
-
-  /**
-   * 复试报告编号
-   */
-  reexamineReportName?: string;
-
-  /**
-   * 复试报告文件路径
-   */
-  reexamineReportUrl?: string;
+  fileOssIdMap?: Map<string, string | number>;
 
   /**
    * 使用部位
diff --git a/plus-ui/src/api/project/constructionUser/types.ts b/plus-ui/src/api/project/constructionUser/types.ts
index fd689e44..f66fa167 100644
--- a/plus-ui/src/api/project/constructionUser/types.ts
+++ b/plus-ui/src/api/project/constructionUser/types.ts
@@ -19,7 +19,7 @@ export interface ConstructionUserVO {
   /**
    * 人脸照
    */
-  pacePhoto: string;
+  facePic: string;
 
   /**
    * 人员姓名
@@ -71,6 +71,16 @@ export interface ConstructionUserVO {
    */
   nation: string;
 
+  /**
+   * 身份证正面照片
+   */
+  sfzFrontPic: string;
+
+  /**
+   * 身份证背面照片
+   */
+  sfzBackPic: string;
+
   /**
    * 身份证号码
    */
@@ -101,6 +111,11 @@ export interface ConstructionUserVO {
    */
   nativePlace: string;
 
+  /**
+   * 银行卡图片
+   */
+  yhkPic: string;
+
   /**
    * 银行卡号
    */
@@ -121,6 +136,11 @@ export interface ConstructionUserVO {
    */
   typeOfWork: number;
 
+  /**
+   * 特种工作证图片
+   */
+  specialWorkPic: string;
+
   /**
    * 打卡(0启用打卡 1禁止打卡)
    */
@@ -166,7 +186,7 @@ export interface ConstructionUserForm extends BaseEntity {
   /**
    * 人脸照
    */
-  pacePhoto?: string;
+  facePic?: string;
 
   /**
    * 人员姓名
@@ -213,6 +233,16 @@ export interface ConstructionUserForm extends BaseEntity {
    */
   nation?: string;
 
+  /**
+   * 身份证正面照片
+   */
+  sfzFrontPic: string;
+
+  /**
+   * 身份证背面照片
+   */
+  sfzBackPic: string;
+
   /**
    * 身份证号码
    */
@@ -243,6 +273,11 @@ export interface ConstructionUserForm extends BaseEntity {
    */
   nativePlace?: string;
 
+  /**
+   * 银行卡图片
+   */
+  yhkPic: string;
+
   /**
    * 银行卡号
    */
@@ -263,6 +298,11 @@ export interface ConstructionUserForm extends BaseEntity {
    */
   typeOfWork?: number;
 
+  /**
+   * 特种工作证图片
+   */
+  specialWorkPic: string;
+
   /**
    * 打卡(0启用打卡 1禁止打卡)
    */
@@ -300,11 +340,6 @@ export interface ConstructionUserQuery extends PageRequest {
    */
   nickName?: string;
 
-  /**
-   * 人脸照
-   */
-  pacePhoto?: string;
-
   /**
    * 人员姓名
    */
diff --git a/plus-ui/src/api/project/contractor/types.ts b/plus-ui/src/api/project/contractor/types.ts
index 607b77db..9b695f47 100644
--- a/plus-ui/src/api/project/contractor/types.ts
+++ b/plus-ui/src/api/project/contractor/types.ts
@@ -29,6 +29,11 @@ export interface ContractorVO {
    */
   custodianPhone: string;
 
+  /**
+   * 公司相关文件
+   */
+  fileMap: Record<string, string>;
+
   /**
    * 备注
    */
@@ -66,6 +71,11 @@ export interface ContractorForm extends BaseEntity {
    */
   custodianPhone?: string;
 
+  /**
+   * 公司相关文件
+   */
+  fileMap: Record<string, string | number>;
+
   /**
    * 备注
    */
diff --git a/plus-ui/src/layout/components/Sidebar/Logo.vue b/plus-ui/src/layout/components/Sidebar/Logo.vue
index 631c2610..3badc086 100644
--- a/plus-ui/src/layout/components/Sidebar/Logo.vue
+++ b/plus-ui/src/layout/components/Sidebar/Logo.vue
@@ -34,7 +34,7 @@ defineProps({
   }
 });
 
-const title = ref('RuoYi-Vue-Plus');
+const title = ref('新能源项目管理平台');
 const settingsStore = useSettingsStore();
 const sideTheme = computed(() => settingsStore.sideTheme);
 </script>
diff --git a/plus-ui/src/views/login.vue b/plus-ui/src/views/login.vue
index cbc980cf..62927eaa 100644
--- a/plus-ui/src/views/login.vue
+++ b/plus-ui/src/views/login.vue
@@ -2,7 +2,7 @@
   <div class="login">
     <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
       <div class="title-box">
-        <h3 class="title">RuoYi-Vue-Plus多租户管理系统</h3>
+        <h3 class="title">新能源项目管理平台</h3>
         <lang-select />
       </div>
       <el-form-item v-if="tenantEnabled" prop="tenantId">
diff --git a/plus-ui/src/views/machinery/component/MachineryDetailAddDialog.vue b/plus-ui/src/views/machinery/component/MachineryDetailAddDialog.vue
index 88b0a478..6eb1682f 100644
--- a/plus-ui/src/views/machinery/component/MachineryDetailAddDialog.vue
+++ b/plus-ui/src/views/machinery/component/MachineryDetailAddDialog.vue
@@ -29,7 +29,7 @@
         <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
       </el-form-item>
       <el-form-item label="图片" prop="picture">
-        <el-input v-model="form.picture" placeholder="请输入图片" />
+        <image-upload v-model="form.picture" />
       </el-form-item>
     </el-form>
     <template #footer>
@@ -80,6 +80,7 @@ const rules = reactive({
 });
 
 const formRef = ref();
+const imageValue = ref([]);
 
 const submitForm = () => {
   formRef.value.validate(async (valid: boolean) => {
diff --git a/plus-ui/src/views/machinery/component/MachineryDetailTable.vue b/plus-ui/src/views/machinery/component/MachineryDetailTable.vue
index 5efe79ca..ad6b9150 100644
--- a/plus-ui/src/views/machinery/component/MachineryDetailTable.vue
+++ b/plus-ui/src/views/machinery/component/MachineryDetailTable.vue
@@ -10,9 +10,9 @@
       <el-table-column label="检验单位" align="center" prop="checkoutUnit" />
       <el-table-column label="检定日期/有效期" align="center" prop="checkoutDate" />
       <el-table-column label="入场时间" align="center" prop="entryTime" />
-      <el-table-column label="图片" align="center" prop="picture">
+      <el-table-column label="图片" align="center" prop="pictureList.url">
         <template #default="scope">
-          <el-image :src="scope.row.picture" />
+          <el-image :key="picture.id" v-for="picture in scope.row.pictureList" :src="picture.url" />
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
@@ -68,7 +68,7 @@
           <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
         <el-form-item label="图片" prop="picture">
-          <el-input v-model="form.picture" placeholder="请输入图片" />
+          <image-upload v-model="form.picture" />
         </el-form-item>
       </el-form>
       <template #footer>
diff --git a/plus-ui/src/views/materials/materials/index.vue b/plus-ui/src/views/materials/materials/index.vue
index 5f92e669..1902d8b7 100644
--- a/plus-ui/src/views/materials/materials/index.vue
+++ b/plus-ui/src/views/materials/materials/index.vue
@@ -9,7 +9,7 @@
             </el-form-item>
             <el-form-item label="材料提供商" prop="companyId">
               <el-select v-model="queryParams.companyId" clearable placeholder="请选择材料提供商">
-                <el-option v-for="item in companyOptions" :key="item.id" :label="item.companyName" :value="item.id" />
+                <el-option v-for="item in companyOptions" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -62,17 +62,7 @@
         <el-table-column label="材料名称" align="center" prop="materialsName" />
         <el-table-column label="公司名称" align="center" prop="companyVo.companyName" />
         <el-table-column label="规格型号" align="center" prop="typeSpecificationName" />
-        <!--        <el-table-column label="规格型号文件路径" align="center" prop="typeSpecificationUrl" />
-                <el-table-column label="合格证编号名称" align="center" prop="certificateConformityName" />
-                <el-table-column label="合格证编号文件路径" align="center" prop="certificateConformityUrl" />
-                <el-table-column label="质量说明书编号" align="center" prop="qualityName" />
-                <el-table-column label="质量说明书文件路径" align="center" prop="qualityUrl" />
-                <el-table-column label="检验报告编号" align="center" prop="inspectionReportName" />
-                <el-table-column label="检验报告文件路径" align="center" prop="inspectionReportUrl" />
-                <el-table-column label="复试报告编号" align="center" prop="reexamineReportName" />
-                <el-table-column label="复试报告文件路径" align="center" prop="reexamineReportUrl" />-->
         <el-table-column label="使用部位" align="center" prop="usePart" />
-        <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="计量单位" align="center" prop="weightId" />
         <el-table-column label="预计材料数量" align="center" prop="quantityCount" />
         <el-table-column label="状态" align="center" prop="status">
@@ -80,6 +70,7 @@
             <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
           </template>
         </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="220">
           <template #default="scope">
             <el-space wrap>
@@ -97,42 +88,17 @@
     </el-card>
     <!-- 添加或修改材料名称对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="materialsFormRef" :model="form" :rules="rules" label-width="160px">
+      <el-form ref="materialsFormRef" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="材料名称" prop="materialsName">
           <el-input v-model="form.materialsName" placeholder="请输入材料名称" />
         </el-form-item>
-        <!-- <el-form-item label="公司id" prop="companyId">
-          <el-input v-model="form.companyId" placeholder="请输入公司id" />
-        </el-form-item> -->
         <el-form-item label="规格型号名称" prop="typeSpecificationName">
           <el-input v-model="form.typeSpecificationName" placeholder="请输入规格型号名称" />
         </el-form-item>
-        <el-form-item label="规格型号文件路径" prop="typeSpecificationUrl">
-          <el-input v-model="form.typeSpecificationUrl" placeholder="请输入规格型号文件路径" />
-        </el-form-item>
-        <el-form-item label="合格证编号名称" prop="certificateConformityName">
-          <el-input v-model="form.certificateConformityName" placeholder="请输入合格证编号名称" />
-        </el-form-item>
-        <el-form-item label="合格证编号文件路径" prop="certificateConformityUrl">
-          <el-input v-model="form.certificateConformityUrl" placeholder="请输入合格证编号文件路径" />
-        </el-form-item>
-        <el-form-item label="质量说明书编号" prop="qualityName">
-          <el-input v-model="form.qualityName" placeholder="请输入质量说明书编号" />
-        </el-form-item>
-        <el-form-item label="质量说明书文件路径" prop="qualityUrl">
-          <el-input v-model="form.qualityUrl" placeholder="请输入质量说明书文件路径" />
-        </el-form-item>
-        <el-form-item label="检验报告编号" prop="inspectionReportName">
-          <el-input v-model="form.inspectionReportName" placeholder="请输入检验报告编号" />
-        </el-form-item>
-        <el-form-item label="检验报告文件路径" prop="inspectionReportUrl">
-          <el-input v-model="form.inspectionReportUrl" placeholder="请输入检验报告文件路径" />
-        </el-form-item>
-        <el-form-item label="复试报告编号" prop="reexamineReportName">
-          <el-input v-model="form.reexamineReportName" placeholder="请输入复试报告编号" />
-        </el-form-item>
-        <el-form-item label="复试报告文件路径" prop="reexamineReportUrl">
-          <el-input v-model="form.reexamineReportUrl" placeholder="请输入复试报告文件路径" />
+        <el-form-item label="材料供应商" prop="companyId">
+          <el-select v-model="form.companyId" clearable placeholder="请选择材料提供商">
+            <el-option v-for="item in companyOptions" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
         </el-form-item>
         <el-form-item label="使用部位" prop="usePart">
           <el-input v-model="form.usePart" placeholder="请输入使用部位" />
@@ -146,6 +112,22 @@
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
+        <el-form-item label="材料文件" prop="fileOssIdMap">
+          <div :key="item.value" v-for="item in materials_file_type">
+            <h3>{{ item.label }}</h3>
+            <file-upload
+              v-model="ossIdMap[item.value]"
+              :limit="1"
+              :file-size="50"
+              :file-type="['pdf']"
+              @update:model-value="
+                (args) => {
+                  handleOssUpdate(args, item.value);
+                }
+              "
+            />
+          </div>
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -164,9 +146,11 @@ import { MaterialsForm, MaterialsQuery, MaterialsVO } from '@/api/materials/mate
 import { useUserStoreHook } from '@/store/modules/user';
 import MaterialsInventoryTable from '@/views/materials/materials/component/MaterialsInventoryTable.vue';
 import MaterialsInventoryAddDialog from '@/views/materials/materials/component/MaterialsInventoryAddDialog.vue';
+import { listCompany } from '@/api/materials/company';
+import { CompanyVO } from '@/api/materials/company/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
+const { sys_normal_disable, materials_file_type } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'materials_file_type'));
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
@@ -194,15 +178,7 @@ const initFormData: MaterialsForm = {
   companyId: undefined,
   projectId: currentProject.value.id,
   typeSpecificationName: undefined,
-  typeSpecificationUrl: undefined,
-  certificateConformityName: undefined,
-  certificateConformityUrl: undefined,
-  qualityName: undefined,
-  qualityUrl: undefined,
-  inspectionReportName: undefined,
-  inspectionReportUrl: undefined,
-  reexamineReportName: undefined,
-  reexamineReportUrl: undefined,
+  fileOssIdMap: undefined,
   usePart: undefined,
   weightId: undefined,
   remark: undefined,
@@ -220,15 +196,7 @@ const data = reactive<PageData<MaterialsForm, MaterialsQuery>>({
     companyId: undefined,
     projectId: currentProject.value.id,
     typeSpecificationName: undefined,
-    typeSpecificationUrl: undefined,
-    certificateConformityName: undefined,
-    certificateConformityUrl: undefined,
-    qualityName: undefined,
-    qualityUrl: undefined,
-    inspectionReportName: undefined,
-    inspectionReportUrl: undefined,
-    reexamineReportName: undefined,
-    reexamineReportUrl: undefined,
+    fileOssIdMap: undefined,
     usePart: undefined,
     weightId: undefined,
     quantityCount: undefined,
@@ -249,14 +217,23 @@ const getList = async () => {
   const res = await listMaterials(queryParams.value);
   materialsList.value = res.data.records;
   total.value = res.data.total;
-  const companyMap = new Map();
-  res.data.records.forEach((record: MaterialsVO) => {
-    const { id, companyName } = record.companyVo;
-    if (!companyMap.has(id)) {
-      companyMap.set(id, { id, companyName });
-    }
+  loading.value = false;
+};
+
+/** 获取当前项目下的公司列表 */
+const getCompanyList = async () => {
+  loading.value = true;
+  const companyRes = await listCompany({
+    current: 1,
+    pageSize: 1000,
+    sortField: 'createTime',
+    sortOrder: 'descend',
+    projectId: currentProject.value.id
   });
-  companyOptions.value = Array.from(companyMap.values());
+  companyOptions.value = companyRes.data.records.map((company: CompanyVO) => ({
+    value: company.id,
+    label: company.companyName
+  }));
   loading.value = false;
 };
 
@@ -319,6 +296,7 @@ const handleUpdate = async (row?: MaterialsVO) => {
   const _id = row?.id || ids.value[0];
   const res = await getMaterials(_id);
   Object.assign(form.value, res.data);
+  ossIdMap.value = res.data.fileOssMap ?? { '0': '' };
   dialog.visible = true;
   dialog.title = '修改材料名称';
 };
@@ -329,9 +307,15 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.id) {
-        await updateMaterials(form.value).finally(() => (buttonLoading.value = false));
+        await updateMaterials({
+          ...form.value,
+          fileOssIdMap: ossIdMap.value
+        }).finally(() => (buttonLoading.value = false));
       } else {
-        await addMaterials(form.value).finally(() => (buttonLoading.value = false));
+        await addMaterials({
+          ...form.value,
+          fileOssIdMap: ossIdMap.value
+        }).finally(() => (buttonLoading.value = false));
       }
       proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
@@ -367,7 +351,19 @@ const handleAddMaterialsInventory = (row?: MaterialsVO) => {
   dialogRef.value.openDialog();
 };
 
+/** 文件更新操作 */
+const ossIdMap = ref<Record<string, string>>({});
+const handleOssUpdate = (ossId: string, value: string) => {
+  // 判断 ossId 是否为空
+  if (ossId === '' || ossId === null || ossId === undefined) {
+    delete ossIdMap.value[value]; // 删除 key
+  } else {
+    ossIdMap.value[value] = ossId; // 直接赋值
+  }
+};
+
 onMounted(() => {
   getList();
+  getCompanyList();
 });
 </script>
diff --git a/plus-ui/src/views/project/constructionUser/index.vue b/plus-ui/src/views/project/constructionUser/index.vue
index 0f334867..e9edea58 100644
--- a/plus-ui/src/views/project/constructionUser/index.vue
+++ b/plus-ui/src/views/project/constructionUser/index.vue
@@ -113,14 +113,8 @@
     <!-- 添加或修改施工人员对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="constructionUserFormRef" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="微信id" prop="openid">
-          <el-input v-model="form.openid" placeholder="请输入微信id" />
-        </el-form-item>
-        <el-form-item label="微信名称" prop="nickName">
-          <el-input v-model="form.nickName" placeholder="请输入微信名称" />
-        </el-form-item>
         <el-form-item label="人脸照" prop="pacePhoto">
-          <el-input v-model="form.pacePhoto" type="textarea" placeholder="请输入内容" />
+          <image-upload v-model="form.facePic" :limit="1" :is-show-tip="false" />
         </el-form-item>
         <el-form-item label="人员姓名" prop="userName">
           <el-input v-model="form.userName" placeholder="请输入人员姓名" />
@@ -136,6 +130,12 @@
         <el-form-item label="民族" prop="nation">
           <el-input v-model="form.nation" placeholder="请输入民族" />
         </el-form-item>
+        <el-form-item label="身份证正面图片" prop="sfzFrontPic">
+          <image-upload v-model="form.sfzFrontPic" :limit="1" :is-show-tip="false" />
+        </el-form-item>
+        <el-form-item label="身份证背面图片" prop="sfzBackPic">
+          <image-upload v-model="form.sfzBackPic" :limit="1" :is-show-tip="false" />
+        </el-form-item>
         <el-form-item label="身份证号码" prop="sfzNumber">
           <el-input v-model="form.sfzNumber" placeholder="请输入身份证号码" />
         </el-form-item>
@@ -154,6 +154,9 @@
         <el-form-item label="籍贯" prop="nativePlace">
           <el-input v-model="form.nativePlace" placeholder="请输入籍贯" />
         </el-form-item>
+        <el-form-item label="银行图片" prop="yhkPic">
+          <image-upload v-model="form.yhkPic" :limit="1" :is-show-tip="false" />
+        </el-form-item>
         <el-form-item label="银行卡号" prop="yhkNumber">
           <el-input v-model="form.yhkNumber" placeholder="请输入银行卡号" />
         </el-form-item>
@@ -168,6 +171,9 @@
             <el-option v-for="item in type_of_work" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
+        <el-form-item label="特种作业证图片" prop="specialWorkPic">
+          <image-upload v-model="form.specialWorkPic" :limit="1" :is-show-tip="false" />
+        </el-form-item>
         <el-form-item label="打卡" prop="clock">
           <el-select v-model="form.clock" clearable placeholder="请选择打卡状态">
             <el-option v-for="item in user_clock_type" :key="item.value" :label="item.label" :value="item.value" />
@@ -230,7 +236,7 @@ const initFormData: ConstructionUserForm = {
   id: undefined,
   openid: undefined,
   nickName: undefined,
-  pacePhoto: undefined,
+  facePic: undefined,
   userName: undefined,
   projectId: currentProject.value.id,
   contractorId: undefined,
@@ -240,16 +246,20 @@ const initFormData: ConstructionUserForm = {
   phone: undefined,
   sex: undefined,
   nation: undefined,
+  sfzFrontPic: undefined,
+  sfzBackPic: undefined,
   sfzNumber: undefined,
   sfzStart: undefined,
   sfzEnd: undefined,
   sfzSite: undefined,
   sfzBirth: undefined,
   nativePlace: undefined,
+  yhkPic: undefined,
   yhkNumber: undefined,
   yhkOpeningBank: undefined,
   yhkCardholder: undefined,
   typeOfWork: undefined,
+  specialWorkPic: undefined,
   clock: undefined,
   entryDate: undefined,
   leaveDate: undefined,
@@ -265,7 +275,6 @@ const data = reactive<PageData<ConstructionUserForm, ConstructionUserQuery>>({
     sortOrder: 'descend',
     openid: undefined,
     nickName: undefined,
-    pacePhoto: undefined,
     userName: undefined,
     projectId: currentProject.value.id,
     contractorId: undefined,
diff --git a/plus-ui/src/views/project/contractor/component/ContractorFileDialog.vue b/plus-ui/src/views/project/contractor/component/ContractorFileDialog.vue
new file mode 100644
index 00000000..452b17d8
--- /dev/null
+++ b/plus-ui/src/views/project/contractor/component/ContractorFileDialog.vue
@@ -0,0 +1,92 @@
+<template>
+  <el-button type="primary" @click="handleUpdateFile">保存文件</el-button>
+  <el-row :gutter="20">
+    <el-col :span="8">
+      <el-menu :default-active="activeMenu" @select="handleMenuClick">
+        <el-menu-item :key="item.value" v-for="item in contractor_file_type" :index="item.value">
+          <el-space>
+            <p>{{ item.label }}</p>
+            <el-tag type="success" v-if="ossIdMap[item.value]">已上传</el-tag>
+            <el-tag type="warning" v-else>未上传</el-tag>
+          </el-space>
+        </el-menu-item>
+      </el-menu>
+    </el-col>
+    <el-col :span="16">
+      <file-upload
+        v-model="ossIdMap[activeMenu]"
+        :limit="1"
+        :file-size="50"
+        :file-type="['pdf']"
+        @update:model-value="
+          (args) => {
+            handleOssUpdate(args);
+          }
+        "
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import { getContractor, updateContractor } from '@/api/project/contractor';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { contractor_file_type } = toRefs<any>(proxy?.useDict('contractor_file_type'));
+
+interface Props {
+  contractorId?: string | number;
+}
+
+const props = defineProps<Props>();
+const loading = ref<boolean>(false);
+
+// 当前选中的菜单项
+const activeMenu = ref('0'); // 默认选中第一个
+const ossIdMap = ref<Record<string, string>>({});
+// 处理菜单点击事件
+const handleMenuClick = (index: string) => {
+  activeMenu.value = index;
+};
+// 获取公司详情
+const getComponentVO = async () => {
+  loading.value = true;
+  const res = await getContractor(props.contractorId);
+  ossIdMap.value = res.data.fileMap ?? { '0': '' };
+  loading.value = false;
+};
+
+const handleOssUpdate = (ossId: string) => {
+  // 判断 ossId 是否为空
+  if (ossId === '' || ossId === null || ossId === undefined) {
+    delete ossIdMap.value[activeMenu.value]; // 删除 key
+  } else {
+    ossIdMap.value[activeMenu.value] = ossId; // 直接赋值
+  }
+  console.log(ossIdMap.value);
+};
+
+const handleUpdateFile = async () => {
+  loading.value = true;
+  await updateContractor({
+    id: props.contractorId,
+    fileMap: ossIdMap.value
+  });
+  proxy?.$modal.msgSuccess('保存成功');
+  loading.value = false;
+};
+
+watch(
+  () => props.contractorId,
+  (newId, oldId) => {
+    if (newId !== oldId) {
+      getComponentVO();
+    }
+  }
+);
+
+onMounted(() => {
+  getComponentVO();
+});
+</script>
diff --git a/plus-ui/src/views/project/contractor/index.vue b/plus-ui/src/views/project/contractor/index.vue
index 0d8f3ef4..c64e2f99 100644
--- a/plus-ui/src/views/project/contractor/index.vue
+++ b/plus-ui/src/views/project/contractor/index.vue
@@ -7,18 +7,6 @@
             <el-form-item label="公司名称" prop="name">
               <el-input v-model="queryParams.name" placeholder="请输入公司名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <!--<el-form-item label="负责人" prop="principal">
-              <el-input v-model="queryParams.principal" placeholder="请输入负责人" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="负责人联系电话" prop="principalPhone">
-              <el-input v-model="queryParams.principalPhone" placeholder="请输入负责人联系电话" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="管理人" prop="custodian">
-              <el-input v-model="queryParams.custodian" placeholder="请输入管理人" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="管理人联系电话" prop="custodianPhone">
-              <el-input v-model="queryParams.custodianPhone" placeholder="请输入管理人联系电话" clearable @keyup.enter="handleQuery" />
-            </el-form-item>-->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -63,6 +51,7 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-space wrap>
+              <el-button link type="primary" icon="Plus" @click="handleContractorFile(scope.row)">文件</el-button>
               <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:contractor:edit']">修改 </el-button>
               <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:contractor:remove']">
                 删除
@@ -103,12 +92,16 @@
         </div>
       </template>
     </el-dialog>
+    <el-dialog title="上传文件" v-model="visible" width="800px">
+      <contractor-file-dialog :contractor-id="currentContractorId" />
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="Contractor" lang="ts">
 import { addContractor, delContractor, getContractor, listContractor, updateContractor } from '@/api/project/contractor';
 import { ContractorForm, ContractorQuery, ContractorVO } from '@/api/project/contractor/types';
+import ContractorFileDialog from '@/views/project/contractor/component/ContractorFileDialog.vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
@@ -136,6 +129,7 @@ const initFormData: ContractorForm = {
   principalPhone: undefined,
   custodian: undefined,
   custodianPhone: undefined,
+  fileMap: undefined,
   remark: undefined
 };
 const data = reactive<PageData<ContractorForm, ContractorQuery>>({
@@ -253,6 +247,15 @@ const handleExport = () => {
   );
 };
 
+/** 文件操作 **/
+const visible = ref();
+const currentContractorId = ref<number | string>(0);
+const handleContractorFile = (row?: ContractorVO) => {
+  currentContractorId.value = row.id ?? 0;
+  console.log(currentContractorId.value);
+  visible.value = true;
+};
+
 onMounted(() => {
   getList();
 });
diff --git a/plus-ui/src/views/project/project/index.vue b/plus-ui/src/views/project/project/index.vue
index ded4e599..146dc205 100644
--- a/plus-ui/src/views/project/project/index.vue
+++ b/plus-ui/src/views/project/project/index.vue
@@ -68,11 +68,7 @@
         <el-table-column label="打卡范围" align="center" prop="punchRange" />
         <el-table-column label="设计总量" align="center" prop="designTotal" />
         <el-table-column label="备注" align="center" prop="remark" />
-        <!-- <el-table-column label="安全协议书" align="center" prop="securityAgreement" /> -->
-        <!-- <el-table-column label="排序字段" align="center" prop="sort" />/ -->
-        <!-- <el-table-column label="显示隐藏" align="center" prop="showHidden" /> -->
-        <!-- <el-table-column label="是否删除" align="center" prop="isDelete" /> -->
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="260">
           <template #default="scope">
             <el-space wrap>
               <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:project:edit']">修改 </el-button>
@@ -93,9 +89,6 @@
         <el-form-item label="项目简称" prop="shortName">
           <el-input v-model="form.shortName" placeholder="请输入项目简称" />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
         <el-form-item label="项目地址" prop="projectSite">
           <el-input v-model="form.projectSite" placeholder="请输入项目地址" />
         </el-form-item>
@@ -120,18 +113,12 @@
         <el-form-item label="设计总量" prop="designTotal">
           <el-input v-model="form.designTotal" placeholder="请输入设计总量" />
         </el-form-item>
-        <!-- <el-form-item label="安全协议书" prop="securityAgreement">
-          <el-input v-model="form.securityAgreement" placeholder="请输入安全协议书" />
+        <el-form-item label="安全协议书" prop="securityAgreement">
+          <file-upload v-model="form.securityAgreement" :limit="1" :file-type="['pdf']" :file-size="50" />
         </el-form-item>
-        <el-form-item label="排序字段" prop="sort">
-          <el-input v-model="form.sort" placeholder="请输入排序字段" />
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="显示隐藏" prop="showHidden">
-          <el-input v-model="form.showHidden" placeholder="请输入显示隐藏" />
-        </el-form-item>
-        <el-form-item label="是否删除" prop="isDelete">
-          <el-input v-model="form.isDelete" placeholder="请输入是否删除" />
-        </el-form-item> -->
       </el-form>
       <template #footer>
         <div class="dialog-footer">
diff --git a/plus-ui/src/views/project/projectTeam/component/UserListDialog.vue b/plus-ui/src/views/project/projectTeam/component/UserListDialog.vue
index 91d689b8..320011f9 100644
--- a/plus-ui/src/views/project/projectTeam/component/UserListDialog.vue
+++ b/plus-ui/src/views/project/projectTeam/component/UserListDialog.vue
@@ -1,91 +1,85 @@
 <template>
   <div>
-    <el-dialog title="项目班组的成员" v-model="visible" @close="closeModal">
-      <template #header>
-        {{ props.projectTeamVo.teamName }}
-      </template>
-      <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-        <el-form-item label="施工人员" prop="memberName">
-          <el-input v-model="queryParams.memberName" placeholder="请输入施工人员" clearable @keyup.enter="handleQuery" />
-        </el-form-item>
-        <el-form-item label="岗位" prop="postId">
-          <el-select v-model="queryParams.postId" clearable placeholder="请选择岗位">
-            <el-option v-for="item in user_post_type" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button size="small" type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['project:projectTeamMember:add']">
-            新增
-          </el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            size="small"
-            type="success"
-            plain
-            icon="Edit"
-            :disabled="single"
-            @click="handleUpdate()"
-            v-hasPermi="['project:projectTeamMember:edit']"
-          >
-            修改
-          </el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            size="small"
-            type="danger"
-            plain
-            icon="Delete"
-            :disabled="multiple"
-            @click="handleDelete()"
-            v-hasPermi="['project:projectTeamMember:remove']"
-          >
-            删除
-          </el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button size="small" type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:projectTeamMember:export']">
-            导出
-          </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="loading" :data="projectTeamMemberList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" type="index" width="60" align="center" />
-        <el-table-column label="施工人员" align="center" prop="memberName" />
-        <el-table-column label="岗位" align="center" prop="postId">
-          <template #default="scope">
-            <dict-tag :options="user_post_type" :value="scope.row.postId" />
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-space wrap>
-              <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:projectTeamMember:edit']">
-                修改
-              </el-button>
-              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:projectTeamMember:remove']">
-                删除
-              </el-button>
-            </el-space>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.pageSize" @pagination="getList" />
-    </el-dialog>
+    <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+      <el-form-item label="施工人员" prop="memberName">
+        <el-input v-model="queryParams.memberName" placeholder="请输入施工人员" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="岗位" prop="postId">
+        <el-select v-model="queryParams.postId" clearable placeholder="请选择岗位">
+          <el-option v-for="item in user_post_type" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button size="small" type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['project:projectTeamMember:add']"> 新增 </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="small"
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate()"
+          v-hasPermi="['project:projectTeamMember:edit']"
+        >
+          修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="small"
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete()"
+          v-hasPermi="['project:projectTeamMember:remove']"
+        >
+          删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button size="small" type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:projectTeamMember:export']">
+          导出
+        </el-button>
+      </el-col>
+    </el-row>
+    <el-table v-loading="loading" :data="projectTeamMemberList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" type="index" width="60" align="center" />
+      <el-table-column label="施工人员" align="center" prop="memberName" />
+      <el-table-column label="岗位" align="center" prop="postId">
+        <template #default="scope">
+          <dict-tag :options="user_post_type" :value="scope.row.postId" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-space wrap>
+            <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:projectTeamMember:edit']">
+              修改
+            </el-button>
+            <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:projectTeamMember:remove']">
+              删除
+            </el-button>
+          </el-space>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.pageSize" @pagination="getList" />
+
     <!-- 添加或修改项目班组下的成员对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="projectTeamMemberFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="施工人员" prop="memberId">
-          <el-select v-model="form.memberId" clearable placeholder="请选择岗位">
+          <el-select v-model="form.memberId" clearable placeholder="请选择人员">
             <el-option v-for="item in userNotInTeamOpt" :key="item.value" :label="item.label" :value="item.value" />
             <pagination
               v-show="total > 0"
@@ -141,16 +135,11 @@ interface Props {
   projectTeamVo: ProjectTeamVO;
 }
 
-const props = withDefaults(defineProps<Props>(), {});
+const props = defineProps<Props>();
 // 是否可见
 const visible = ref(false);
 const initFormData: ProjectTeamMemberForm = {
-  id: undefined,
-  teamId: props.projectTeamVo.id,
-  projectId: currentProject.value.id,
-  memberId: undefined,
-  postId: undefined,
-  remark: undefined
+  projectId: currentProject.value.id
 };
 const data = reactive<PageData<ProjectTeamMemberForm, ProjectTeamMemberQuery>>({
   form: { ...initFormData },
@@ -159,11 +148,7 @@ const data = reactive<PageData<ProjectTeamMemberForm, ProjectTeamMemberQuery>>({
     pageSize: 10,
     sortField: 'createTime',
     sortOrder: 'descend',
-    teamId: props.projectTeamVo.id,
-    projectId: currentProject.value.id,
-    memberId: undefined,
-    postId: undefined,
-    params: {}
+    projectId: currentProject.value.id
   },
   rules: {
     id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }]
@@ -187,25 +172,12 @@ const projectTeamMemberList = ref<ProjectTeamMemberVO[]>([]);
 /** 查询项目班组下的成员列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await listProjectTeamMember(queryParams.value);
+  const res = await listProjectTeamMember({ ...queryParams.value, teamId: props.projectTeamVo.id });
   projectTeamMemberList.value = res.data.records;
   total.value = res.data.total;
   loading.value = false;
 };
 
-/** 查询项目下的成员列表 */
-
-// 打开弹窗
-const openModal = () => {
-  visible.value = true;
-  getList();
-};
-
-// 关闭弹窗
-const closeModal = () => {
-  visible.value = false;
-};
-
 /** 取消按钮 */
 const cancel = () => {
   reset();
@@ -284,7 +256,10 @@ const submitForm = () => {
       if (form.value.id) {
         await updateProjectTeamMember(form.value).finally(() => (buttonLoading.value = false));
       } else {
-        await addProjectTeamMember(form.value).finally(() => (buttonLoading.value = false));
+        await addProjectTeamMember({
+          ...form.value,
+          teamId: props.projectTeamVo.id
+        }).finally(() => (buttonLoading.value = false));
       }
       proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
@@ -313,8 +288,16 @@ const handleExport = () => {
   );
 };
 
-// 暴露函数给父组件
-defineExpose({
-  openModal
+watch(
+  () => props.projectTeamVo,
+  (newId, oldId) => {
+    if (newId !== oldId) {
+      getList();
+    }
+  }
+);
+
+onMounted(() => {
+  getList();
 });
 </script>
diff --git a/plus-ui/src/views/project/projectTeam/index.vue b/plus-ui/src/views/project/projectTeam/index.vue
index cc052003..14ec9d62 100644
--- a/plus-ui/src/views/project/projectTeam/index.vue
+++ b/plus-ui/src/views/project/projectTeam/index.vue
@@ -70,7 +70,9 @@
           <el-input v-model="form.teamName" placeholder="请输入班组名称" />
         </el-form-item>
         <el-form-item label="打卡范围" prop="isClockIn">
-          <el-input v-model="form.isClockIn" placeholder="请输入范围内打卡" />
+          <el-select v-model="form.isClockIn" clearable placeholder="请选择打卡范围">
+            <el-option v-for="item in team_clock_type" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -83,7 +85,9 @@
         </div>
       </template>
     </el-dialog>
-    <user-list-dialog ref="userListVisible" :projectTeamVo="currentRow" />
+    <el-dialog :title="currentRow.teamName" v-model="visible">
+      <user-list-dialog :projectTeamVo="currentRow" />
+    </el-dialog>
   </div>
 </template>
 
@@ -208,12 +212,11 @@ const handleUpdate = async (row?: ProjectTeamVO) => {
   dialog.title = '修改项目班组';
 };
 
-/**  */
+const visible = ref<boolean>(false);
+/** 班组成员操作 */
 const handleUserList = (row?: ProjectTeamVO) => {
-  if (userListVisible.value) {
-    currentRow.value = row;
-    userListVisible.value.openModal();
-  }
+  currentRow.value = row;
+  visible.value = true;
 };
 
 /** 提交按钮 */
diff --git a/plus-ui/src/views/register.vue b/plus-ui/src/views/register.vue
index f1d1e5a7..692e1a38 100644
--- a/plus-ui/src/views/register.vue
+++ b/plus-ui/src/views/register.vue
@@ -2,7 +2,7 @@
   <div class="register">
     <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
       <div class="title-box">
-        <h3 class="title">RuoYi-Vue-Plus多租户管理系统</h3>
+        <h3 class="title">新能源项目管理平台</h3>
         <lang-select />
       </div>
       <el-form-item v-if="tenantEnabled" prop="tenantId">