累积更新

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceController.java

@@ -111,6 +111,8 @@ public class CmcDeviceController extends BaseController
         statusObject.put("已停用", cmcDeviceService.selectCmcDeviceList(cmcDevice).size());
         cmcDevice.setStatus("4");
         statusObject.put("已报废", cmcDeviceService.selectCmcDeviceList(cmcDevice).size());
+        cmcDevice.setStatus("5");
+        statusObject.put("已处置", cmcDeviceService.selectCmcDeviceList(cmcDevice).size());
         //整体
         if (cmcDeviceApproval.getApplyDate() == null) {
             //每年派车次数

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectController.java

@@ -9,13 +9,16 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.file.domain.FilesAchievement;
 import com.ruoyi.file.service.IFilesAchievementService;
 import com.ruoyi.oa.domain.*;
 import com.ruoyi.oa.service.*;
+import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.web.controller.qyweixin.MessageController;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +61,9 @@ public class CmcProjectController extends BaseController
     @Autowired
     private ISysUserService userService;
 
+    @Autowired
+    private ISysRoleService roleService;
+
     @Autowired
     private ICmcManageDeptService cmcManageDeptService;
 
@@ -349,6 +355,25 @@ public class CmcProjectController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcProject cmcProject)
     {
+        if (cmcProject.getProjectLeader() != null) {
+            SysUser user = userService.selectUserById(cmcProject.getProjectLeader());
+            List<SysRole> sysRoleList = user.getRoles();
+            Long[] roles = new Long[sysRoleList.size()];
+            boolean isProjectLeader = false;
+            for (int i = 0; i < sysRoleList.size(); i++) {
+                roles[i] = sysRoleList.get(i).getRoleId();
+                if (sysRoleList.get(i).getRoleId() == 15L) {
+                    isProjectLeader = true;
+                }
+            }
+            //新增项目负责人角色
+            if (!isProjectLeader) {
+                Long[] newRoles = new Long[roles.length + 1];
+                System.arraycopy(roles, 0, newRoles, 0, roles.length);
+                newRoles[newRoles.length - 1] = 15L;
+                userService.insertUserAuth(user.getUserId(), newRoles);
+            }
+        }
         return toAjax(cmcProjectService.updateCmcProject(cmcProject));
     }
 

oa-back/ruoyi-agent/src/main/java/com/ruoyi/agent/service/impl/McpServiceImpl.java

@@ -80,10 +80,10 @@ public class McpServiceImpl implements IMcpService {
         if (milvusServiceUrl == null || milvusServiceUrl.isEmpty()) {
             throw new IllegalStateException("Milvus service URL 未配置");
         }
-//        milvusClient = new MilvusClientV2(
-//                ConnectConfig.builder()
-//                        .uri(milvusServiceUrl)
-//                        .build());
+        milvusClient = new MilvusClientV2(
+                ConnectConfig.builder()
+                        .uri(milvusServiceUrl)
+                        .build());
     }
     /**
      * 调用LLM+RAG（外部文件+知识库）生成回答

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/controller/CmcAgentController.java

@@ -94,9 +94,9 @@ public class CmcAgentController extends BaseController
      * @return
      */
     @PostMapping("/modifyFile")
-    public AjaxResult uploadModifyFile(MultipartFile file, String agentName) throws IOException
+    public AjaxResult uploadModifyFile(String topicId, MultipartFile file, String agentName) throws IOException
     {
-        return success(cmcAgentService.uploadModifyFile(file, agentName));
+        return success(cmcAgentService.uploadModifyFile(topicId, file, agentName));
     }
 
     /**

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/controller/SessionController.java

@@ -91,8 +91,9 @@ public class SessionController extends BaseController
                 "2. 如果需要查询数据，调用SQLQuery工具并传入正确的SQL语句  \n" +
                 "3. 生成标准MYSQL查询语句，根据语义和字段类型使用COUNT/SUM/AVG等聚合函数  \n" +
                 "4. 如果单表字段不满足查询需求，根据OA系统表结构信息进行多张表连接查询  \n" +
-                "5. 给生成的字段取一个简短的中文名称  \n" +
-                "6. 输出格式：使用[]包含sql文本，例如:[select 1 from dual]\n";
+                "5. 如果字段值由逗号隔开，根据OA系统表结构信息进行多张表连接查询，采用concat方式多值匹配  \n" +
+                "6. 给生成的字段取一个简短的中文名称  \n" +
+                "7. 输出格式：使用[]包含sql文本，例如:[select 1 from dual]\n";
         messages.add(ChatMessage.ofUser(prompt));
         ChatSession chatSession =  InMemoryChatSession.builder().messages(messages).build();
         ChatResponse response = chatModel.prompt(chatSession).call();

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/service/impl/LangChainMilvusServiceImpl.java

@@ -80,10 +80,10 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
         if (milvusServiceUrl == null || milvusServiceUrl.isEmpty()) {
             throw new IllegalArgumentException("milvusServiceUrl 配置不能为空");
         }
-//        milvusClient = new MilvusClientV2(
-//                ConnectConfig.builder()
-//                        .uri(milvusServiceUrl)
-//                        .build());
+        milvusClient = new MilvusClientV2(
+                ConnectConfig.builder()
+                        .uri(milvusServiceUrl)
+                        .build());
     }
 
     /**
@@ -139,6 +139,19 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
                     data.add(jsonObject);
                 }
 
+                // 添加一条包含所有二、三级标题的记录
+                String titlesContent = extractAllTitles(transferFile);
+                if (!titlesContent.trim().isEmpty()) {
+                    JSONObject titlesJsonObj = new JSONObject();
+                    titlesJsonObj.put("file_name", file.getOriginalFilename());
+                    titlesJsonObj.put("file_type", "标题");
+                    titlesJsonObj.put("content", titlesContent);
+                    titlesJsonObj.put("embedding", embeddingModel.embed(titlesContent).content().vectorAsList());
+                    String titlesJsonString = titlesJsonObj.toJSONString();
+                    JsonObject titlesJsonObject = JsonParser.parseString(titlesJsonString).getAsJsonObject();
+                    data.add(titlesJsonObject);
+                }
+
                 // 加载集合
                 LoadCollectionReq loadCollectionReq = LoadCollectionReq.builder()
                         .collectionName(collectionName)
@@ -422,6 +435,42 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
         return searchResultList;
     }
 
+    /**
+     * 提取文档中的所有二、三级标题
+     */
+    private String extractAllTitles(File transferFile) throws Exception {
+        StringBuilder titlesBuilder = new StringBuilder();
+        String filename = transferFile.getName().toLowerCase();
+        
+        if (filename.endsWith(".docx")) {
+            try (XWPFDocument document = new XWPFDocument(new FileInputStream(transferFile))) {
+                for (XWPFParagraph paragraph : document.getParagraphs()) {
+                    String text = paragraph.getText().trim();
+                    if (text.isEmpty()) continue;
+                    if (paragraph.getStyle() != null) {
+                        if (paragraph.getStyle().equals("2") || paragraph.getStyle().equals("3")) {
+                            titlesBuilder.append(text).append("\n");
+                        }
+                    }
+                }
+            }
+        } else if (filename.endsWith(".doc")) {
+            try (HWPFDocument document = new HWPFDocument(new FileInputStream(transferFile))) {
+                Range range = document.getRange();
+                for (int i = 0; i < range.numParagraphs(); i++) {
+                    Paragraph paragraph = range.getParagraph(i);
+                    String text = paragraph.text().trim();
+                    if (text.isEmpty()) continue;
+                    short styleIndex = paragraph.getStyleIndex();
+                    if (styleIndex == 2 || styleIndex == 3) {
+                        titlesBuilder.append(text).append("\n");
+                    }
+                }
+            }
+        }
+        return titlesBuilder.toString();
+    }
+
     /**
      * 检索知识库
      */

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/service/impl/MilvusServiceImpl.java

@@ -34,10 +34,10 @@ public class MilvusServiceImpl implements IMilvusService {
         if (milvusServiceUrl == null || milvusServiceUrl.isEmpty()) {
             throw new IllegalArgumentException("milvusServiceUrl 配置不能为空");
         }
-//        milvusClient = new MilvusClientV2(
-//                ConnectConfig.builder()
-//                        .uri(milvusServiceUrl)
-//                        .build());
+        milvusClient = new MilvusClientV2(
+                ConnectConfig.builder()
+                        .uri(milvusServiceUrl)
+                        .build());
     }
 
     /**

oa-back/ruoyi-system/src/main/java/com/ruoyi/llm/service/ICmcAgentService.java

@@ -53,7 +53,7 @@ public interface ICmcAgentService
      * @param file 文件
      * @return 结果
      */
-    public JSONObject uploadModifyFile(MultipartFile file, String agentName) throws IOException;
+    public JSONObject uploadModifyFile(String topicId, MultipartFile file, String agentName) throws IOException;
 
     /**
      * 上传多文件

oa-back/ruoyi-system/src/main/java/com/ruoyi/llm/service/impl/CmcAgentServiceImpl.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.utils.SnowFlake;
 import com.ruoyi.llm.domain.CmcAgent;
 import com.ruoyi.llm.domain.CmcChat;
 import com.ruoyi.llm.domain.CmcDocument;
+import com.ruoyi.llm.domain.CmcTopic;
 import com.ruoyi.llm.mapper.CmcAgentMapper;
 import com.ruoyi.llm.mapper.CmcChatMapper;
 import com.ruoyi.llm.mapper.CmcDocumentMapper;
@@ -37,6 +38,7 @@ import org.apache.poi.hwpf.usermodel.Paragraph;
 import org.apache.poi.hwpf.usermodel.Range;
 import org.apache.poi.xwpf.usermodel.*;
 import org.apache.xmlbeans.XmlCursor;
+import org.checkerframework.checker.units.qual.C;
 import org.noear.solon.ai.chat.ChatModel;
 import org.noear.solon.ai.chat.ChatResponse;
 import org.noear.solon.ai.chat.ChatSession;
@@ -47,7 +49,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.PostConstruct;
 import java.io.*;
+import java.math.BigInteger;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -82,6 +86,19 @@ public class CmcAgentServiceImpl implements ICmcAgentService
     @Value("${milvusService.url}")
     private String milvusServiceUrl;
 
+    private MilvusClientV2 milvusClient;
+
+    @PostConstruct
+    public void initMilvusClient() {
+        if (milvusServiceUrl == null || milvusServiceUrl.isEmpty()) {
+            throw new IllegalArgumentException("milvusServiceUrl 配置不能为空");
+        }
+        milvusClient = new MilvusClientV2(
+                ConnectConfig.builder()
+                        .uri(milvusServiceUrl)
+                        .build());
+    }
+
     /**
      * 查询智能体
      *
@@ -194,7 +211,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService
      * @return 结果
      */
     @Override
-    public JSONObject uploadModifyFile(MultipartFile file, String agentName) throws IOException {
+    public JSONObject uploadModifyFile(String topicId, MultipartFile file, String agentName) throws IOException {
         processValue = "";
         String prefixPath = "/upload/agent/" + agentName;
         File profilePath = new File( RuoYiConfig.getProfile() + prefixPath);
@@ -211,7 +228,10 @@ public class CmcAgentServiceImpl implements ICmcAgentService
             Files.deleteIfExists(inputFilePath);
             file.transferTo(transferFile);
         }
-        processValue = "上传完成:100%";
+        processValue = "文件上传完成:100%";
+        CmcChat chat = new CmcChat();
+        chat.setTopicId(topicId);
+        String inputPath = RuoYiConfig.getProfile() + cmcChatMapper.selectCmcChatList(chat).get(0).getInput().split("：")[1];
         CmcDocument cmcDocument = new CmcDocument();
         cmcDocument.setDocumentId(new SnowFlake().generateId());
         cmcDocument.setChatId(chatId);
@@ -228,14 +248,17 @@ public class CmcAgentServiceImpl implements ICmcAgentService
             cmcChat.setUserId(SecurityUtils.getUserId());
             cmcChatMapper.insertCmcChat(cmcChat);
             InputStream fileInputStream = new FileInputStream(profilePath + "/" + file.getOriginalFilename());
+            String firstParagraphText = "";
             try (XWPFDocument doc = new XWPFDocument(fileInputStream)) {
+                firstParagraphText = doc.getParagraphs().get(1).getText();
                 // 保存文档到本地文件系统
                 try (FileOutputStream out = new FileOutputStream(profilePath + "/" + file.getOriginalFilename())) {
                     doc.write(out);
                 }
             }
             List<String> subTitles = extractSubTitles(profilePath + "/" + file.getOriginalFilename(), "技术文件");
-            message = generateAnswerWithDocumentAndCollection(profilePath + "/" + file.getOriginalFilename(), subTitles);
+            List<String> firstParagraphSubTitles = extractSubTitles(profilePath + "/" + file.getOriginalFilename(), firstParagraphText);
+            message = generateAnswerWithDocumentAndCollection(inputPath,profilePath + "/" + file.getOriginalFilename(), subTitles, firstParagraphSubTitles);
         }
         jsonObject.put("assistantMessage", message);
         return jsonObject;
@@ -337,8 +360,8 @@ public class CmcAgentServiceImpl implements ICmcAgentService
     /**
      * 调用LLM生成回答 - 针对技术文件章节内容生成
      */
-    public String generateAnswerWithDocumentAndCollection(String templatePath, List<String> titles) throws IOException {
-        File profilePath = new File(templatePath);
+    public String generateAnswerWithDocumentAndCollection(String uploadFilePath, String templatePath, List<String> titles, List<String> firstParagraphSubTitles) throws IOException {
+        File profilePath = new File(uploadFilePath);
 
         // 构建招标文件内容的嵌入向量存储
         InMemoryEmbeddingStore<TextSegment> embeddingStore = new InMemoryEmbeddingStore<>();
@@ -356,10 +379,13 @@ public class CmcAgentServiceImpl implements ICmcAgentService
         for (String title : titles) {
             try {
                 // 1. 从招标文件中检索相关内容
-                List<String> tenderContent = retrieveFromTenderDocument(embeddingStore, title);
-
+                List<String> tenderContent = new ArrayList<>();
+                if (firstParagraphSubTitles.contains(title))
+                    retrieveFromTenderDocument(embeddingStore, title, firstParagraphSubTitles);
+                else
+                    tenderContent.add(segments.get(0).text());
                 // 2. 从知识库中检索相似章节内容
-                List<JSONObject> knowledgeContexts = retrieveFromMilvus("technical", title, 10);
+                List<JSONObject> knowledgeContexts = retrieveFromMilvus("technical", title, 10, "file_type != '标题'", firstParagraphSubTitles);
 
                 // 3. 构建针对该章节的提示语
                 String prompt = buildChapterPrompt(title, tenderContent, knowledgeContexts);
@@ -372,7 +398,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService
                 allGeneratedContent.append(title).append("\n").append(chapterContent).append("\n\n");
 
                 // 更新进度
-                processValue = "生成章节内容中: " + Double.parseDouble(String.format("%.2f%n", (double) (titles.indexOf(title) + 1)  / titles.size() * 100)) + "%";
+                processValue = "生成【" + title + "】章节内容中: " + Double.parseDouble(String.format("%.2f%n", (double) (titles.indexOf(title) + 1)  / titles.size() * 100)) + "%";
                 successTitles.add(title);
 
             } catch (Exception e) {
@@ -407,7 +433,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService
     /**
      * 从招标文件中检索与指定标题相关的内容
      */
-    private List<String> retrieveFromTenderDocument(InMemoryEmbeddingStore<TextSegment> embeddingStore, String title) {
+    private List<String> retrieveFromTenderDocument(InMemoryEmbeddingStore<TextSegment> embeddingStore, String title, List<String> firstParagraphSubTitles) {
         List<String> relevantContent = new ArrayList<>();
 
         try {
@@ -427,7 +453,6 @@ public class CmcAgentServiceImpl implements ICmcAgentService
         } catch (Exception e) {
             System.err.println("从招标文件检索内容时出错: " + e.getMessage());
         }
-
         return relevantContent;
     }
 
@@ -577,21 +602,22 @@ public class CmcAgentServiceImpl implements ICmcAgentService
             if (line.contains("6."))
                 chapter2List.add(line.replace("*", "").replace("#", "").replace("-", ""));
         }
+        processValue = "已生成二级标题:100%";
         for (String chapter2 : chapter2List) {
             String orderNum = chapter2.split(" ")[0];
             StringBuilder sb = new StringBuilder("二级标题如下：\n").append(chapter2)
-                    .append("\n 请以上述二级标题作为检索词，到技术知识库中检索最相似的片段，结合检索结果编排该二级标题下的三级标题，严格按以下格式，仅输出三级标题列表：\n")
+                    .append("\n 请以上述二级标题作为检索词，到技术知识库中检索最相似的标题，结合检索结果编排该二级标题下的三级标题，严格按以下格式，仅输出三级标题列表：\n")
                     .append(orderNum).append(".1 XX\n")
                     .append(orderNum).append(".2 XX\n")
                     .append(orderNum).append(".3 XX\n");
 
-            List<JSONObject> contexts = retrieveFromMilvus("technical", chapter2, 10);
+            List<JSONObject> contexts = retrieveFromMilvus("technical", chapter2, 10, "file_type == '标题'", new ArrayList<>());
             for (JSONObject context : contexts) {
                 sb.append("参考内容").append(": ")
                         .append(context.getString("content")).append("\n\n");
             }
             chapter3.append(generateAnswer(sb.toString()));
-            processValue = "分析中:" + Double.parseDouble(String.format("%.2f%n", (double) (chapter2List.indexOf(chapter2) + 1)  / chapter2List.size() * 100)) + "%";
+            processValue = "正在根据技术文档知识库生成二级标题下三级标题:" + Double.parseDouble(String.format("%.2f%n", (double) (chapter2List.indexOf(chapter2) + 1)  / chapter2List.size() * 100)) + "%";
         }
         String sb = "二级标题如下：\n" + chapters2 +
                 "\n 三级标题如下：" + chapter3 +
@@ -636,25 +662,23 @@ public class CmcAgentServiceImpl implements ICmcAgentService
      * 从Milvus检索相关文档
      * @return
      */
-    public List<JSONObject> retrieveFromMilvus(String collectionName, String query, int topK) {
+    public List<JSONObject> retrieveFromMilvus(String collectionName, String query, int topK, String filter, List<String> firstParagraphSubTitles) {
         List<JSONObject> resultList = new ArrayList<>();
-        List<List<SearchResp.SearchResult>> searchResultList = retrieve(collectionName, query, topK);
-        searchResultList.forEach(searchResult -> {
-            JSONObject result = new JSONObject();
-            result.put("content", searchResult.get(0).getEntity().get("content"));
-            resultList.add(result);
-        });
+        if (firstParagraphSubTitles.isEmpty() || (!firstParagraphSubTitles.isEmpty() && !firstParagraphSubTitles.contains(query))) {
+            List<List<SearchResp.SearchResult>> searchResultList = retrieve(collectionName, query, topK, filter);
+            searchResultList.forEach(searchResult -> {
+                JSONObject result = new JSONObject();
+                result.put("content", searchResult.get(0).getEntity().get("content"));
+                resultList.add(result);
+            });
+        }
         return resultList;
     }
 
     /**
      * 检索知识库
      */
-    private List<List<SearchResp.SearchResult>> retrieve(String collectionName, String query, int topK) {
-        MilvusClientV2 milvusClient = new MilvusClientV2(
-                ConnectConfig.builder()
-                        .uri(milvusServiceUrl)
-                        .build());
+    private List<List<SearchResp.SearchResult>> retrieve(String collectionName, String query, int topK, String filter) {
         List<BaseVector> queryVector = Collections.singletonList(new FloatVec(embeddingModel.embed(query).content().vector()));
 
         //  加载集合
@@ -675,6 +699,19 @@ public class CmcAgentServiceImpl implements ICmcAgentService
                 .metricType(IndexParam.MetricType.COSINE)
                 .searchParams(searchParams)
                 .build();
+        
+        if (filter != null && !filter.isEmpty()) {
+            searchReq = SearchReq.builder()
+                    .collectionName(collectionName)
+                    .data(queryVector)
+                    .topK(topK)
+                    .filter(filter)
+                    .outputFields(Arrays.asList("file_name", "file_type", "content"))
+                    .annsField("embedding")
+                    .metricType(IndexParam.MetricType.COSINE)
+                    .searchParams(searchParams)
+                    .build();
+        }
 
         SearchResp searchResp = milvusClient.search(searchReq);
         List<List<SearchResp.SearchResult>> searchResultList = searchResp.getSearchResults();
@@ -827,11 +864,13 @@ public class CmcAgentServiceImpl implements ICmcAgentService
             }
 
 
+            processValue = "已获取最低级别子标题列表:100%";
             return subTitles;
 
         }
     }
 
+
     // 检查一个标题是否是叶子节点（没有更低级别的子标题）
     private boolean isLeafNode(XWPFDocument doc, XWPFParagraph p, int level) {
         int index = doc.getPosOfParagraph(p);
@@ -887,7 +926,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService
 
                     if (paragraph.getStyle() != null) {
                         // 二级标题（样式2）开始新的分段
-                        if (paragraph.getStyle().equals("2")) {
+                        if (paragraph.getStyle().equals("3")) {
                             // 保存当前二级标题下的内容
                             if (currentLevel2Content.length() != 0) {
                                 // 检查当前二级标题内容的字节数
@@ -907,7 +946,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService
                                         // 检查是否是三级标题
                                         boolean isLevel3Title = false;
                                         for (XWPFParagraph p : xwpfDocument.getParagraphs()) {
-                                            if (p.getText().trim().equals(para.trim()) && p.getStyle() != null && p.getStyle().equals("3")) {
+                                            if (p.getText().trim().equals(para.trim()) && p.getStyle() != null && p.getStyle().equals("4")) {
                                                 isLevel3Title = true;
                                                 break;
                                             }
@@ -973,7 +1012,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService
                             
                             boolean isLevel3Title = false;
                             for (XWPFParagraph p : xwpfDocument.getParagraphs()) {
-                                if (p.getText().trim().equals(para.trim()) && p.getStyle() != null && p.getStyle().equals("3")) {
+                                if (p.getText().trim().equals(para.trim()) && p.getStyle() != null && p.getStyle().equals("4")) {
                                     isLevel3Title = true;
                                     break;
                                 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudget.java

@@ -38,6 +38,10 @@ public class CmcBudget extends BaseEntity
 //    @Excel(name = "间接成本")
     private BigDecimal fixCost;
 
+    /** 内业绩效额 */
+//    @Excel(name = "内业绩效额")
+    private BigDecimal settleExpense;
+
     /** 人员成本 */
     @Excel(name = "人员成本")
     private BigDecimal staffCost;
@@ -50,6 +54,10 @@ public class CmcBudget extends BaseEntity
     @Excel(name = "设备成本")
     private BigDecimal deviceCost;
 
+    /** 经营相关费用 */
+    @Excel(name = "经营相关费用")
+    private BigDecimal businessCost;
+
     /** 现场开支 */
     @Excel(name = "现场开支")
     private BigDecimal siteCost;
@@ -58,10 +66,6 @@ public class CmcBudget extends BaseEntity
 //    @Excel(name = "直接成本")
     private BigDecimal directExpense;
 
-    /** 预结算额 */
-    @Excel(name = "预结算额")
-    private BigDecimal settleExpense;
-
     /** 外协费用 */
     @Excel(name = "外协费用")
     private BigDecimal outExpense;
@@ -179,12 +183,32 @@ public class CmcBudget extends BaseEntity
     @Excel(name = "预算附件")
     private String document;
 
+    /** 人员核算成本 */
+    @Excel(name = "人员核算成本")
+    private BigDecimal staffAdjust;
+
+    /** 车辆核算成本 */
+    @Excel(name = "车辆核算成本")
+    private BigDecimal carAdjust;
+
+    /** 设备核算成本 */
+    @Excel(name = "设备核算成本")
+    private BigDecimal deviceAdjust;
+
+    /** 经营相关核算费用 */
+    @Excel(name = "经营相关核算费用")
+    private BigDecimal businessAdjust;
+
     /** 现场开支核算 */
     @Excel(name = "现场开支核算 ")
     private BigDecimal siteAdjust;
 
+    /** 现场外开支核算 */
+    @Excel(name = "现场外开支核算 ")
+    private BigDecimal otherCost;
+
     /** 内业核算绩效总额 */
-    @Excel(name = "内业核算绩效总额")
+//    @Excel(name = "内业核算绩效总额")
     private BigDecimal settleAdjust;
 
     /** 外协核算费用 */
@@ -329,6 +353,15 @@ public class CmcBudget extends BaseEntity
     {
         return businessExpense;
     }
+    public void setBusinessCost(BigDecimal businessCost)
+    {
+        this.businessCost = businessCost;
+    }
+
+    public BigDecimal getBusinessCost()
+    {
+        return businessCost;
+    }
     public void setTaxExpense(BigDecimal taxExpense)
     {
         this.taxExpense = taxExpense;
@@ -677,6 +710,51 @@ public class CmcBudget extends BaseEntity
     {
         return travelAdjust;
     }
+    public void setStaffAdjust(BigDecimal staffAdjust)
+    {
+        this.staffAdjust = staffAdjust;
+    }
+
+    public BigDecimal getStaffAdjust()
+    {
+        return staffAdjust;
+    }
+    public void setCarAdjust(BigDecimal carAdjust)
+    {
+        this.carAdjust = carAdjust;
+    }
+
+    public BigDecimal getCarAdjust()
+    {
+        return carAdjust;
+    }
+    public void setDeviceAdjust(BigDecimal deviceAdjust)
+    {
+        this.deviceAdjust = deviceAdjust;
+    }
+
+    public BigDecimal getDeviceAdjust()
+    {
+        return deviceAdjust;
+    }
+    public void setBusinessAdjust(BigDecimal businessAdjust)
+    {
+        this.businessAdjust = businessAdjust;
+    }
+
+    public BigDecimal getBusinessAdjust()
+    {
+        return businessAdjust;
+    }
+    public void setOtherCost(BigDecimal otherCost)
+    {
+        this.otherCost = otherCost;
+    }
+
+    public BigDecimal getOtherCost()
+    {
+        return otherCost;
+    }
     public void setProcInstId(String procInstId)
     {
         this.procInstId = procInstId;
@@ -699,6 +777,7 @@ public class CmcBudget extends BaseEntity
                 .append("settleExpense", getSettleExpense())
                 .append("outExpense", getOutExpense())
                 .append("businessExpense", getBusinessExpense())
+                .append("businessCost", getBusinessCost())
                 .append("rentExpense", getRentExpense())
                 .append("otherExpense", getOtherExpense())
                 .append("outRemark", getOutRemark())
@@ -711,6 +790,10 @@ public class CmcBudget extends BaseEntity
                 .append("compiler", getCompiler())
                 .append("auditor", getAuditor())
                 .append("createTime", getCreateTime())
+                .append("staffAdjust", getStaffAdjust())
+                .append("carAdjust", getCarAdjust())
+                .append("deviceAdjust", getDeviceAdjust())
+                .append("businessAdjust", getBusinessAdjust())
                 .toString();
     }
 }

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBudgetMapper.xml

@@ -14,6 +14,7 @@
         <result property="settleExpense"    column="settle_expense"    />
         <result property="outExpense"    column="out_expense"    />
         <result property="businessExpense"    column="business_expense"    />
+        <result property="businessCost"    column="business_cost"    />
         <result property="taxExpense"    column="tax_expense"    />
         <result property="rentExpense"    column="rent_expense"    />
         <result property="otherExpense"    column="other_expense"    />
@@ -49,7 +50,12 @@
         <result property="letterAdjust"    column="letter_adjust"    />
         <result property="winAdjust"    column="win_adjust"    />
         <result property="travelAdjust"    column="travel_adjust"    />
+        <result property="staffAdjust"    column="staff_adjust"    />
+        <result property="carAdjust"    column="car_adjust"    />
+        <result property="deviceAdjust"    column="device_adjust"    />
+        <result property="businessAdjust"    column="business_adjust"    />
         <result property="siteCost"    column="site_cost"    />
+        <result property="otherCost"    column="other_cost"    />
         <result property="siteAdjust"    column="site_adjust"    />
         <result property="procInstId"    column="proc_inst_id"    />
         <association property="compilerUser"    javaType="SysUser"         resultMap="CompilerResult" />
@@ -86,11 +92,11 @@
     </resultMap>
 
     <sql id="selectCmcBudgetVo">
-        select b.budget_id, b.project_id, p.project_number, p.project_name, b.staff_cost, b.car_cost, b.device_cost, b.fix_cost, b.settle_expense, b.out_expense, b.business_expense, b.tax_expense,
-               b.rent_expense, b.other_expense, b.out_remark, b.business_remark, b.tax_remark, b.rent_remark, b.other_remark, b.direct_expense, b.total_budget, b.compiler, b.site_cost, b.site_adjust,
+        select b.budget_id, b.project_id, p.project_number, p.project_name, b.staff_cost, b.car_cost, b.device_cost, b.fix_cost, b.settle_expense, b.out_expense, b.business_expense, b.business_cost, b.tax_expense,
+               b.rent_expense, b.other_expense, b.out_remark, b.business_remark, b.tax_remark, b.rent_remark, b.other_remark, b.direct_expense, b.total_budget, b.compiler, b.site_cost, b.other_cost, b.site_adjust,
                u.nick_name as compiler_nick_name, b.manager, u1.nick_name as manager_nick_name, b.auditor, u2.nick_name as zjl_nick_name, b.approver, u3.nick_name as dsz_nick_name, b.create_time, b.manager_time, b.zjl_time, b.dsz_time,
                b.manager_comment, b.zjl_comment, b.dsz_comment, b.remark, b.document, b.letter_expense, b.win_expense, b.travel_expense, b.settle_adjust, b.letter_remark, b.travel_remark, b.win_remark,
-               b.out_adjust, b.tax_adjust, b.letter_adjust, b.win_adjust, b.travel_adjust, b.proc_inst_id from cmc_budget as b
+               b.out_adjust, b.tax_adjust, b.letter_adjust, b.win_adjust, b.travel_adjust, b.staff_adjust, b.car_adjust, b.device_adjust, b.business_adjust, b.proc_inst_id from cmc_budget as b
             left join sys_user as u on u.user_id = b.compiler
             left join sys_user as u1 on u1.user_id = b.manager
             left join sys_user as u2 on u2.user_id = b.auditor
@@ -138,6 +144,7 @@
             <if test="settleExpense != null">settle_expense,</if>
             <if test="outExpense != null">out_expense,</if>
             <if test="businessExpense != null">business_expense,</if>
+            <if test="businessCost != null">business_cost,</if>
             <if test="taxExpense != null">tax_expense,</if>
             <if test="rentExpense != null">rent_expense,</if>
             <if test="otherExpense != null">other_expense,</if>
@@ -172,8 +179,13 @@
             <if test="letterAdjust != null">letter_adjust,</if>
             <if test="winAdjust != null">win_adjust,</if>
             <if test="travelAdjust != null">travel_adjust,</if>
+            <if test="staffAdjust != null">staff_adjust,</if>
+            <if test="carAdjust != null">car_adjust,</if>
+            <if test="deviceAdjust != null">device_adjust,</if>
+            <if test="businessAdjust != null">business_adjust,</if>
             <if test="procInstId != null">proc_inst_id,</if>
             <if test="siteCost != null">site_cost,</if>
+            <if test="otherCost != null">other_cost,</if>
             <if test="siteAdjust != null">site_adjust,</if>
             create_time
         </trim>
@@ -187,6 +199,7 @@
             <if test="settleExpense != null">#{settleExpense},</if>
             <if test="outExpense != null">#{outExpense},</if>
             <if test="businessExpense != null">#{businessExpense},</if>
+            <if test="businessCost != null">#{businessCost},</if>
             <if test="taxExpense != null">#{taxExpense},</if>
             <if test="rentExpense != null">#{rentExpense},</if>
             <if test="otherExpense != null">#{otherExpense},</if>
@@ -221,8 +234,13 @@
             <if test="letterAdjust != null">#{letterAdjust},</if>
             <if test="winAdjust != null">#{winAdjust},</if>
             <if test="travelAdjust != null">#{travelAdjust},</if>
+            <if test="staffAdjust != null">#{staffAdjust},</if>
+            <if test="carAdjust != null">#{carAdjust},</if>
+            <if test="deviceAdjust != null">#{deviceAdjust},</if>
+            <if test="businessAdjust != null">#{businessAdjust},</if>
             <if test="procInstId != null">#{procInstId},</if>
             <if test="siteCost != null">#{siteCost},</if>
+            <if test="otherCost != null">#{otherCost},</if>
             <if test="siteAdjust != null">#{siteAdjust},</if>
             sysdate()
         </trim>
@@ -239,6 +257,7 @@
             <if test="settleExpense != null">settle_expense = #{settleExpense},</if>
             <if test="outExpense != null">out_expense = #{outExpense},</if>
             <if test="businessExpense != null">business_expense = #{businessExpense},</if>
+            <if test="businessCost != null">business_cost = #{businessCost},</if>
             <if test="taxExpense != null">tax_expense = #{taxExpense},</if>
             <if test="rentExpense != null">rent_expense = #{rentExpense},</if>
             <if test="otherExpense != null">other_expense = #{otherExpense},</if>
@@ -274,8 +293,13 @@
             <if test="letterAdjust != null">letter_adjust = #{letterAdjust},</if>
             <if test="winAdjust != null">win_adjust = #{winAdjust},</if>
             <if test="travelAdjust != null">travel_adjust = #{travelAdjust},</if>
+            <if test="staffAdjust != null">staff_adjust = #{staffAdjust},</if>
+            <if test="carAdjust != null">car_adjust = #{carAdjust},</if>
+            <if test="deviceAdjust != null">device_adjust = #{deviceAdjust},</if>
+            <if test="businessAdjust != null">business_adjust = #{businessAdjust},</if>
             <if test="procInstId != null">proc_inst_id = #{procInstId},</if>
             <if test="siteCost != null">site_cost = #{siteCost},</if>
+            <if test="otherCost != null">other_cost = #{otherCost},</if>
             <if test="siteAdjust != null">site_adjust = #{siteAdjust},</if>
         </trim>
         where budget_id = #{budgetId}

oa-ui/src/api/llm/agent.js

@@ -65,8 +65,9 @@ export function uploadFile(file, agentName) {
 }
 
 // 上传单文件
-export function uploadModifyFile(file, agentName) {
+export function uploadModifyFile(topicId, file, agentName) {
   const formData = new FormData()
+  formData.append('topicId', topicId)
   formData.append('file', file)
   formData.append('agentName', agentName)
   return request({

oa-ui/src/utils/request.js

@@ -17,7 +17,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 300000 //5分钟
+  timeout: 1800000 //30分钟
 })
 
 // request拦截器

oa-ui/src/views/file/filesProject/project.vue

@@ -451,7 +451,7 @@ export default {
   /* ------------------------------------------------------------------------------------------------------------ */
   /* 获取项目列表 */
   methods: {
-    getProList() {
+    async getProList() {
       this.loading = true;
       if (this.$store.getters.roles.includes('projectLeader') && !this.$store.getters.roles.includes('leader')) {
         this.queryParams.projectLeader = this.$store.getters.userId

oa-ui/src/views/file/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:49
  * @LastEditors: wrh
- * @LastEditTime: 2024-09-06 15:52:46
+ * @LastEditTime: 2026-02-03 11:35:08
 -->
 <template>
   <div class="warpper-container">
@@ -342,6 +342,10 @@ export default {
       pageNum: 1,
       pageSize: 10000,
     }
+    if (this.$store.getters.roles.includes('projectLeader') && !this.$store.getters.roles.includes('leader')) {
+      param.projectLeader = this.$store.getters.userId
+      this.queryParams.projectLeader = this.$store.getters.userId
+    }
     this.getProjectCluster(param); //地图数据集cluster对应allproTableData，此值不变    
     this.getProjectList(this.queryParams); //项目列表对应projectList，此值随搜索变化
   },
@@ -499,8 +503,8 @@ export default {
             that.map.removeInteraction(that.drawBox);
           }
         } else if (e && e.keyCode == 13) {
-        let newArray = that.seletctedCluters.join(',');
-          getInfoByProjectNumbers({projectNumber: newArray, pageSize: that.queryParams.pageSize, pageNum: that.queryParams.pageNum}).then(res => {
+          let newArray = that.seletctedCluters.join(',');
+          getInfoByProjectNumbers({ projectNumber: newArray, pageSize: that.queryParams.pageSize, pageNum: that.queryParams.pageNum }).then(res => {
             if (res.total > 0) {
               that.projectList = res.rows;
               that.total = res.total;
@@ -786,7 +790,7 @@ export default {
       this.queryParams.pageNum = val
       if (this.seletctedCluters != []) {
         let newArray = this.seletctedCluters.join(',');
-        getInfoByProjectNumbers({projectNumber: newArray, pageSize: this.queryParams.pageSize, pageNum: this.queryParams.pageNum}).then(res => {
+        getInfoByProjectNumbers({ projectNumber: newArray, pageSize: this.queryParams.pageSize, pageNum: this.queryParams.pageNum }).then(res => {
           if (res.total > 0) {
             this.projectList = res.rows;
             this.total = res.total;
@@ -962,6 +966,9 @@ export default {
           projectType: this.searchVal
         }
       }
+      if (this.$store.getters.roles.includes('projectLeader') && !this.$store.getters.roles.includes('leader')) {
+        param.projectLeader = this.$store.getters.userId
+      }
       listProject(param).then(res => {
         let data = res.rows;
         this.projectList = data;

oa-ui/src/views/file/index/projectLayer.vue

@@ -4,7 +4,7 @@
  * @Author: ysh
  * @Date: 2022-10-20 17:27:09
  * @LastEditors: wrh
- * @LastEditTime: 2025-01-02 09:29:11
+ * @LastEditTime: 2026-02-03 10:50:07
 -->
 <template>
   <div class="layer-box">
@@ -99,6 +99,9 @@ export default {
         pageNum: 1,
         pageSize: 99999999
       }
+      if (this.$store.getters.roles.includes('projectLeader') && !this.$store.getters.roles.includes('leader')) {
+        param.projectLeader = this.$store.getters.userId
+      }
       listProject(param).then(res => {
         if (res.code == 200) {
           let alldata = res.rows;

oa-ui/src/views/flowable/form/budget/addBudget.vue

@@ -437,6 +437,7 @@ export default {
       this.$set(this.budgetForm, "winExpense", val.winExpense);
       this.$set(this.budgetForm, "taxExpense", val.taxExpense);
       this.$set(this.budgetForm, "travelExpense", val.travelExpense);
+      this.$set(this.budgetForm, "businessCost", val.outExpense + val.letterExpense + val.winExpense + val.taxExpense + val.travelExpense);
     },
     getFixCost() {
       const staffCost = this.safeNumber(this.budgetForm.staffCost);

oa-ui/src/views/flowable/form/budget/adjust/budgetAdjust.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-05-07 11:01:39
  * @LastEditors: wrh
- * @LastEditTime: 2025-12-31 16:45:31
+ * @LastEditTime: 2026-02-02 11:09:36
 -->
 <template>
   <div class="main">
@@ -741,6 +741,8 @@ export default {
       let innerSum = this.innerStaffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0)
       let outerSum = this.outerStaffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0)
       this.checkStaffCost = (innerSum + outerSum).toFixed(2);
+      // 计算人员核算成本
+      this.budgetForm.staffAdjust = this.checkStaffCost;
       this.getTotalBudgetAdjust();
     },
 
@@ -750,18 +752,24 @@ export default {
       let innerSum = this.innerStaffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0)
       let outerSum = this.outerStaffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0)
       this.checkStaffCost = (innerSum + outerSum).toFixed(2);
+      // 计算人员核算成本
+      this.budgetForm.staffAdjust = this.checkStaffCost;
       this.getTotalBudgetAdjust();
     },
     // 处理车辆数据变化
     handleCarChange(newList) {
       this.carList = newList;
       this.checkCarCost = this.carList.reduce((sum, car) => sum + (Number(car.amountAdjust) || 0), 0).toFixed(2);
+      // 计算车辆核算成本
+      this.budgetForm.carAdjust = this.checkCarCost;
       this.getTotalBudgetAdjust();
     },
     // 处理设备数据变化
     handleDeviceChange(newList) {
       this.deviceList = newList;
       this.checkDeviceCost = this.deviceList.reduce((sum, device) => sum + (Number(device.amountAdjust) || 0), 0).toFixed(2);
+      // 计算设备核算成本
+      this.budgetForm.deviceAdjust = this.checkDeviceCost;
       this.getTotalBudgetAdjust();
     },
     // 处理现场开支数据变化
@@ -796,12 +804,15 @@ export default {
         Number(newData.winAdjust || 0) +
         Number(newData.taxAdjust || 0) +
         Number(newData.travelAdjust || 0);
+      // 计算经营相关核算成本
+      this.budgetForm.businessAdjust = this.checkJYAmount;
       this.getTotalBudgetAdjust();
     },
     // 处理预算外开销数据变化
     handleOtherChange(newList) {
       this.otherList = newList;
       this.checkOtherCost = this.otherList.reduce((sum, other) => sum + (Number(other.amountAdjust) || 0), 0).toFixed(2);
+      this.budgetForm.otherCost = this.checkOtherCost
       this.getTotalBudgetAdjust();
     },
     getTotalBudgetAdjust() {

oa-ui/src/views/flowable/form/budget/adjust/components/CarCost.vue

@@ -97,7 +97,7 @@ export default {
       this.isOpenCar = true;
     },
     removeCar(car, index) {
-      this.$confirm('确实移除【' + car.car.licensePlate + '】吗', '提示', {
+      this.$confirm('确定移除【' + car.car.licensePlate + '】吗', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

oa-ui/src/views/flowable/form/budget/adjust/components/DeviceCost.vue

@@ -95,7 +95,7 @@ export default {
       this.isOpenDevice = true;
     },
     removeDevice(device, index) {
-      this.$confirm('确实移除【' + device.device.name + '】吗', '提示', {
+      this.$confirm('确定移除【' + device.device.name + '】吗', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

oa-ui/src/views/flowable/form/budget/adjust/components/InnerStaffCost.vue

@@ -138,7 +138,7 @@ export default {
       this.$emit('update:staffList', this.staffList);
     },
     removeStaff(staff, index) {
-      this.$confirm('确实移除【' + staff.user.nickName + '】吗', '提示', {
+      this.$confirm('确定移除【' + staff.user.nickName + '】吗', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

oa-ui/src/views/flowable/form/budget/adjust/components/OuterStaffCost.vue

@@ -152,7 +152,7 @@ export default {
       this.$emit('update:staffList', this.staffList);
     },
     removeStaff(staff, index) {
-      this.$confirm('确实移除【' + staff.user.nickName + '】吗', '提示', {
+      this.$confirm('确定移除【' + staff.user.nickName + '】吗', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

oa-ui/src/views/flowable/form/budget/adjust/components/otherCost.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2025-05-16 10:34:57
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-16 11:06:49
+ * @LastEditors: wrh
+ * @LastEditTime: 2026-02-02 14:54:12
 -->
 <template>
   <div class="other-cost">
@@ -92,7 +92,7 @@ export default {
       });
     },
     removeOther(other, index) {
-      this.$confirm('确实移除【' + other.name + '】吗', '提示', {
+      this.$confirm('确定移除【' + other.name + '】吗', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

oa-ui/src/views/flowable/form/budget/components/chooseDevice.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-06-21 18:51:51
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-07-03 16:38:50
+ * @LastEditors: wrh
+ * @LastEditTime: 2026-02-03 15:32:30
 -->
 <template>
   <div>
@@ -17,6 +17,7 @@
           <el-option :value="'2'" label="维修中"></el-option>
           <el-option :value="'3'" label="已停用"></el-option>
           <el-option :value="'4'" label="已报废"></el-option>
+          <el-option :value="'5'" label="已处置"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="设备名称：">
@@ -206,6 +207,9 @@ export default {
       if (row == '4') {
         return '已报废'
       }
+      if (row == '5') {
+        return '已处置'
+      }
     },
     statusType(row) {
       if (row == '0') {
@@ -215,7 +219,7 @@ export default {
         return 'success'
       }
       if (row == '2') {
-        return 'info'
+        return 'primary'
       }
       if (row == '3') {
         return 'danger'
@@ -223,6 +227,9 @@ export default {
       if (row == '4') {
         return 'info'
       }
+      if (row == '5') {
+        return ''
+      }
     },
     formatChooseList() {
       if (this.chooseList.name) {

oa-ui/src/views/flowable/form/finance/borrowForm.vue

@@ -105,7 +105,7 @@
                 <el-input v-model="detail.applyAmount" :disabled="taskName != '借款申请'"></el-input>
               </td>
               <td v-if="form.borrowUsage == 0 || form.borrowUsage == 1">
-                <el-input v-model="detail.managerAmount" :disabled="taskName != '分管审核'"
+                <el-input v-model="detail.managerAmount" :disabled="taskName != '分管审核' && taskName != '总经理审核'"
                   @blur="calculateManagerAmount(detail)"></el-input>
               </td>
               <td>
@@ -150,7 +150,7 @@
             <el-col :span="12" :xs="24">
               <el-form-item label="核准金额" prop="managerAmount">
                 <el-input v-model="form.managerAmount" placeholder="请输入核准金额"
-                  :disabled="taskName != '分管审核' && taskName != '党工团审核'" />
+                  :disabled="taskName != '分管审核' && taskName != '总经理审核' && taskName != '党工团审核'" />
                 <span style="color:#E74C3C" v-if="exceed && form.managerAmount && form.borrowUsage == 0">超过预算金额：{{
                   getMoreAmount('1') }}</span>
               </el-form-item>

oa-ui/src/views/llm/agent/AgentDetail.vue

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2025-01-01 00:00:00
  * @LastEditors: wrh
- * @LastEditTime: 2026-01-19 15:28:10
+ * @LastEditTime: 2026-02-07 15:49:42
 -->
 <template>
   <div class="agent-detail-container" v-loading="loading">
@@ -92,6 +92,8 @@
                       </el-button>
                   </div>
                   <div v-if="percentageDisplay">
+                    <p class="upload-tip"> </p>
+                    <p class="upload-tip">{{step}}</p>
                     <el-progress :percentage="percentage" :stroke-width="25" :text-inside="true">
                       <el-button text>{{ progress }}</el-button>
                     </el-progress>
@@ -143,6 +145,8 @@
                       </el-button>
                   </div>
                   <div v-if="percentageDisplay">
+                    <p class="upload-tip"> </p>
+                    <p class="upload-tip">{{step}}</p>
                     <el-progress :percentage="percentage" :stroke-width="25" :text-inside="true">
                       <el-button text>{{ progress }}</el-button>
                     </el-progress>
@@ -220,6 +224,7 @@ export default {
       chatTitle: '智能体新对话',
       percentage: 0,
       progress: "",
+      step: "",
       percentageDisplay: false,
       techUploadDisplay: false,
       selectDocument: '',
@@ -373,6 +378,7 @@ export default {
 
         if (hasMessages) {
           this.$message.success(`已加载话题"${topic.topic}"的对话记录`)
+          this.techUploadDisplay = true;
         } else {
           this.$message.info('该话题暂无对话记录')
         }
@@ -576,6 +582,7 @@ export default {
             getProcessValue().then(res => {
               if (res.code == 200 & res.msg.includes(":")) {
                 this.progress = res.msg;
+                this.step = res.msg.split(":")[0]
                 this.percentage = Number(res.msg.split(":")[1].replace("%", ""))
               }
             });
@@ -601,7 +608,7 @@ export default {
               isHtml: true // 标记这是HTML内容
             }
             this.chatMessages.push(uploadMessage);
-            if (this.agentInfo.agentName.includes('技术文件'))
+            if (this.agentInfo.agentName.includes('技术'))
               this.techUploadDisplay = true;
             // this.$message.success('文件上传成功');
             let topicRes = await addTopic({ agentId: this.agentId, topic: fileName });
@@ -669,6 +676,7 @@ export default {
             getProcessValue().then(res => {
               if (res.code == 200 & res.msg.includes(":")) {
                 this.progress = res.msg;
+                this.step = res.msg.split(":")[0]
                 this.percentage = Number(res.msg.split(":")[1].replace("%", ""))
               }
             });
@@ -678,7 +686,7 @@ export default {
         const file = this.chatFileList[0].raw // 只取第一个文件
         const fileName = file.name;
         try {
-          const response = await uploadModifyFile(file, this.agentInfo.agentName)
+          const response = await uploadModifyFile(this.currentTopicId, file, this.agentInfo.agentName)
           const chatId = response.data.chatId; //获取保存后的chatId
           // 解析返回的数据
           if (response.data && response.data.assistantMessage) {

oa-ui/src/views/oa/device/detail.vue

@@ -890,8 +890,11 @@ export default {
       if (row == '4') {
         return '已报废'
       }
+      if (row == '5') {
+        return '已处置'
+      }
     },
-    statusTypeStyle(row) {
+    statusType(row) {
       if (row == '0') {
         return 'warning'
       }
@@ -907,6 +910,9 @@ export default {
       if (row == '4') {
         return 'info'
       }
+      if (row == '5') {
+        return ''
+      }
     }
   },
 }

oa-ui/src/views/oa/device/index.vue

@@ -13,6 +13,8 @@
           </el-option>
           <el-option key="4" label="已报废" value="4">
           </el-option>
+          <el-option key="5" label="已处置" value="5">
+          </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="出厂编号" prop="name">
@@ -235,7 +237,7 @@ export default {
       // cmc设备信息表格数据
       deviceList: [],
       deptList: [],
-      statusList: [{ id: '0', name: '被领用' }, { id: '1', name: '可领用' }, { id: '2', name: '维修中' }, { id: '3', name: '已停用' }, { id: '4', name: '已报废' }],
+      statusList: [{ id: '0', name: '被领用' }, { id: '1', name: '可领用' }, { id: '2', name: '维修中' }, { id: '3', name: '已停用' }, { id: '4', name: '已报废' }, { id: '5', name: '已处置' }],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -402,6 +404,9 @@ export default {
       if (row == '4') {
         return '已报废'
       }
+      if (row == '5') {
+        return '已处置'
+      }
     },
     statusTypeStyle(row) {
       if (row == '0') {
@@ -419,6 +424,9 @@ export default {
       if (row == '4') {
         return 'info'
       }
+      if (row == '5') {
+        return ''
+      }
     }
   }
 };

oa-ui/src/views/oa/supply/deviceList.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-06-21 18:51:51
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-06 17:03:13
+ * @LastEditors: wrh
+ * @LastEditTime: 2026-02-03 15:35:12
 -->
 <template>
   <div>
@@ -23,6 +23,7 @@
           <el-option :value="'2'" label="维修中"></el-option>
           <el-option :value="'3'" label="已停用"></el-option>
           <el-option :value="'4'" label="已报废"></el-option>
+          <el-option :value="'5'" label="已处置"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="设备名称：">
@@ -181,6 +182,9 @@ export default {
       if (row == '4') {
         return '已报废'
       }
+      if (row == '5') {
+        return '已处置'
+      }
     },
     statusType(row) {
       if (row == '0') {
@@ -198,6 +202,9 @@ export default {
       if (row == '4') {
         return 'info'
       }
+      if (row == '5') {
+        return ''
+      }
     },
     formatChooseList() {
       if (this.chooseList.name) {

oa-ui/src/views/oa/supply/index.vue

@@ -13,6 +13,8 @@
           </el-option>
           <el-option key="4" label="已报废" value="4">
           </el-option>
+          <el-option key="5" label="已处置" value="5">
+          </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="设备编码" prop="deviceNumber">
@@ -388,6 +390,9 @@ export default {
       if (row == '4') {
         return '已报废'
       }
+      if (row == '5') {
+        return '已处置'
+      }
     },
     statusTypeStyle(row) {
       if (row == '0') {
@@ -405,6 +410,9 @@ export default {
       if (row == '4') {
         return 'info'
       }
+      if (row == '5') {
+        return ''
+      }
     }
   }
 };