累积更新

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

@@ -220,7 +220,7 @@ public class McpServiceImpl implements IMcpService {
      */
     public String generateAnswer(String prompt) throws IOException {
         ChatModel chatModel = ChatModel.of(llmServiceUrl)
-                .model("Qwen2.5-7B-Instruct")
+                .model("Qwen2.5")
                 .build();
 
         List<ChatMessage> messages = new ArrayList<>();

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

@@ -60,7 +60,7 @@ public class McpController extends BaseController
                 .url("http://localhost:8080/mcp/sse")
                 .build();
         ChatModel chatModel = ChatModel.of(llmServiceUrl)
-                .model("Qwen2.5-7B-Instruct")
+                .model("Qwen2.5")
                 .defaultToolsAdd(clientProvider)
                 .build();
 

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

@@ -55,7 +55,7 @@ public class SessionController extends BaseController
                 .url("http://localhost:8080/mcp/sse")
                 .build();
         ChatModel chatModel = ChatModel.of(llmServiceUrl)
-                .model("Qwen2.5-7B-Instruct")
+                .model("Qwen2.5")
                 .defaultToolsAdd(clientProvider)
                 .build();
 

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

@@ -244,7 +244,7 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
     public Flux<AssistantMessage> generateAnswer(String topicId, String prompt) {
         ChatModel chatModel = ChatModel.of(llmServiceUrl)
 
-                .model("Qwen2.5-7B-Instruct")
+                .model("Qwen2.5")
                 .build();
 
         List<ChatMessage> messages = new ArrayList<>();

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

@@ -644,7 +644,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService
      */
     public String generateAnswer(String prompt) throws IOException {
         ChatModel chatModel = ChatModel.of(llmServiceUrl)
-                .model("Qwen2.5-7B-Instruct")
+                .model("Qwen2.5")
                 .build();
 
         List<ChatMessage> messages = new ArrayList<>();

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

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND create_by like concat('%', #{createBy}, '%')
 			</if>
 		</where>
+		order by update_time desc
     </select>
     
     <insert id="insertNotice" parameterType="SysNotice">

oa-ui/src/store/modules/user.js

@@ -73,7 +73,11 @@ const user = {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
           const user = res.user
-          const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/user.png") : process.env.VUE_APP_BASE_API + user.avatar;
+          let avatar = require("@/assets/images/user.png")
+          if (user.avatar == "" || user.avatar == null)
+            avatar = user.sex == '0' ? avatar : require("@/assets/images/female.png")
+          else
+            avatar = process.env.VUE_APP_BASE_API + user.avatar;
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', res.roles)
             commit('SET_PERMISSIONS', res.permissions)

oa-ui/src/utils/ruoyi.js

@@ -88,7 +88,6 @@ export function selectDictLabel(datas, value) {
 
 // 回显数据字典（字符串、数组）
 export function selectDictLabels(datas, value, separator) {
-  console.log(value);
   if (value === undefined || value === null || value.length === 0) {
     return "";
   }

oa-ui/src/views/oa/staff/changeRecord.vue

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2024-03-25 17:38:39
  * @LastEditors: wrh
- * @LastEditTime: 2025-09-29 09:29:14
+ * @LastEditTime: 2026-02-27 11:09:08
 -->
 <template>
   <div>
@@ -38,6 +38,11 @@
 import { parseTime } from "@/utils/ruoyi";
 import { getUserChangeInfo } from "@/api/system/user";
 export default {
+  props: {
+    userId: {
+      type: Number
+    }
+  },
   dicts: ['sys_user_titles', 'sys_post_status', 'sys_user_certificates', 'sys_user_pmlevel', 'sys_user_engineerlevel', 'sys_user_operatorlevel', 'sys_user_postlevel', 'sys_user_salarylevel', 'sys_user_political', 'sys_user_degree'],
   data() {
     return {
@@ -76,7 +81,10 @@ export default {
     /** 查询变更记录列表 */
     getChangeRecordList() {
       this.loading = true;
-      this.queryParams.userId = Number(this.$route.query.userId);
+      if (this.$route.query.userId)
+        this.queryParams.userId = this.$route.query.userId;
+      else
+        this.queryParams.userId = this.userId;
       getUserChangeInfo(this.queryParams).then(response => {
         this.changeRecordList = response.rows;
         this.filteredData = this.changeRecordList;

oa-ui/src/views/oa/staff/info.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-22 14:50:46
  * @LastEditors: wrh
- * @LastEditTime: 2025-11-18 15:52:46
+ * @LastEditTime: 2026-02-27 15:08:59
 -->
 <template>
   <div class="bg" v-loading="loading">
@@ -150,7 +150,11 @@ export default {
       getUser(id).then(res => {
         this.postOptions = res.posts;
         if (res.data) {
-        this.avatar =  (res.data.avatar == "" || res.data.avatar == null) ? require("@/assets/images/user.png") : process.env.VUE_APP_BASE_API + res.data.avatar;
+          this.avatar = require("@/assets/images/user.png")
+          if (res.data.avatar == "" || res.data.avatar == null)
+            this.avatar = res.data.sex == '0' ? this.avatar : require("@/assets/images/female.png")
+          else
+            this.avatar = process.env.VUE_APP_BASE_API + res.data.avatar;
           this.form = res.data;
           this.formartForm(res);
           this.userInfo = [
@@ -273,12 +277,11 @@ export default {
       this.$router.push({ path: '/oa/staff/people' });
     },
     getAgeByIdCard(idCard) {
-      const sexAndAge = {}
       //获取用户身份证号码
       const userCard = idCard
       //如果用户身份证号码为undefined则返回空
       if (!userCard) {
-        return sexAndAge
+        return 0
       }
       // 获取出生日期
       const yearBirth = userCard.substring(6, 10)
@@ -293,9 +296,7 @@ export default {
       if (monthNow < monthBirth || (monthNow == monthBirth && dayNow < dayBirth)) {
         age--
       }
-      // 得到年龄
-      sexAndAge.age = age
-      return sexAndAge.age
+      return age
     },
   }
 }

oa-ui/src/views/oa/staff/participate.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: wrh
  * @Date: 2024-03-25 17:38:39
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-25 17:01:50
+ * @LastEditors: wrh
+ * @LastEditTime: 2026-02-27 11:08:31
 -->
 <template>
   <div>
@@ -39,6 +39,11 @@
 import { listProject } from "@/api/oa/project/project";
 import { listDeclare } from "@/api/oa/declare/declare"
 export default {
+  props: {
+    userId: {
+      type: Number
+    }
+  },
   data() {
     return {
       // 查询参数
@@ -79,7 +84,10 @@ export default {
       this.getDeclareList();
     },
     getListByPaticipates() {
-      this.queryParams.participates = this.$route.query.userId;
+      if (this.$route.query.userId)
+        this.queryParams.participates = this.$route.query.userId;
+      else
+        this.queryParams.participates = this.userId;
       listProject(this.queryParams).then(res => {
         this.tableData = res.rows
         this.total = res.total

oa-ui/src/views/oa/staff/projectInfo.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: wrh
  * @Date: 2024-03-25 17:38:39
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-25 14:30:36
+ * @LastEditors: wrh
+ * @LastEditTime: 2026-02-27 11:09:38
 -->
 <template>
   <div>
@@ -50,6 +50,11 @@
 
 import { listProject } from "@/api/oa/project/project";
 export default {
+  props: {
+    userId: {
+      type: Number
+    }
+  },
   data() {
     return {
       // 查询参数
@@ -72,7 +77,10 @@ export default {
 
     },
     getListByProjectLeader() {
-      this.queryParams.projectLeader = this.$route.query.userId;
+      if (this.$route.query.userId)
+        this.queryParams.projectLeader = this.$route.query.userId;
+      else
+        this.queryParams.projectLeader = this.userId;
       listProject(this.queryParams).then(res => {
         this.tableData = res.rows
         this.total = res.total

oa-ui/src/views/system/user/profile/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <el-col :span="6" :xs="24">
+      <el-col :span="8" :xs="24" class="userInfo">
         <el-card class="box-card">
           <div slot="header" class="clearfix">
             <span>个人信息</span>
@@ -9,37 +9,28 @@
           <div>
             <div class="text-center">
               <userAvatar />
+              <div class="user-name">{{ user.nickName }}</div>
+              <div class="user-sex">
+                <span class="mr10">{{ getAgeByIdCard(user.idCard) + '岁' }} {{ user.sex == '0' ? ' 男' : ' 女' }}</span>
+                <el-tag type="success" v-if="user.status == '0'">在职</el-tag>
+                <el-tag type="danger" v-if="user.status == '1'">离职</el-tag>
+                <el-tag type="warning" v-if="user.status == '2'">退休</el-tag>
+                <el-tag type="primary" v-if="user.status == '3'">试用</el-tag>
+                <el-tag type="info" v-if="user.status == '4'">返聘</el-tag>
+              </div>
+
+              <div class="info-item" v-for="item in userInfo">
+                <div class="item-label" v-if="item.value != '' && item.value != undefined">
+                  <svg-icon :icon-class="item.icon" class="info-icon"></svg-icon>
+                  <div class="item-label">{{ item.label }}</div>
+                </div>
+                <div>{{ item.value }}</div>
+              </div>
             </div>
-            <ul class="list-group list-group-striped">
-              <li class="list-group-item">
-                <svg-icon icon-class="user" />用户名称
-                <div class="pull-right">{{ user.userName }}</div>
-              </li>
-              <li class="list-group-item">
-                <svg-icon icon-class="phone" />手机号码
-                <div class="pull-right">{{ user.phonenumber }}</div>
-              </li>
-              <li class="list-group-item">
-                <svg-icon icon-class="email" />用户邮箱
-                <div class="pull-right">{{ user.email }}</div>
-              </li>
-              <li class="list-group-item">
-                <svg-icon icon-class="tree" />所属部门
-                <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
-              </li>
-              <li class="list-group-item">
-                <svg-icon icon-class="peoples" />所属角色
-                <div class="pull-right">{{ roleGroup }}</div>
-              </li>
-              <li class="list-group-item">
-                <svg-icon icon-class="date" />创建日期
-                <div class="pull-right">{{ user.createTime }}</div>
-              </li>
-            </ul>
           </div>
         </el-card>
       </el-col>
-      <el-col :span="18" :xs="24">
+      <el-col :span="16" :xs="24" class="stateInfo">
         <el-card>
           <div slot="header" class="clearfix">
             <span>基本资料</span>
@@ -51,6 +42,15 @@
             <el-tab-pane label="修改密码" name="resetPwd">
               <resetPwd />
             </el-tab-pane>
+            <el-tab-pane label="负责项目" name="0">
+              <projectInfo :userId="userId"></projectInfo>
+            </el-tab-pane>
+            <el-tab-pane label="参与项目" name="1">
+              <participate :userId="userId"></participate>
+            </el-tab-pane>
+            <el-tab-pane label="变更记录" name="2">
+              <changeRecord :userId="userId"></changeRecord>
+            </el-tab-pane>
           </el-tabs>
         </el-card>
       </el-col>
@@ -63,15 +63,22 @@ import userAvatar from "./userAvatar";
 import userInfo from "./userInfo";
 import resetPwd from "./resetPwd";
 import { getUserProfile } from "@/api/system/user";
+import projectInfo from '@/views/oa/staff/projectInfo'
+import participate from '@/views/oa/staff/participate'
+import changeRecord from '@/views/oa/staff/changeRecord'
 
 export default {
   name: "Profile",
-  components: { userAvatar, userInfo, resetPwd },
+  components: { userAvatar, userInfo, resetPwd, projectInfo, participate, changeRecord },
+  dicts: ['sys_normal_disable', 'sys_user_sex', 'sys_user_titles', 'sys_user_certificates', 'sys_user_pmlevel',
+    'sys_user_postlevel', 'sys_user_salarylevel', 'sys_user_political', 'sys_user_degree', 'sys_user_engineerlevel', 'sys_user_operatorlevel'], 
   data() {
     return {
       user: {},
+      userId: this.$store.getters.userId,
       roleGroup: {},
       postGroup: {},
+      userInfo: [],
       activeTab: "userinfo"
     };
   },
@@ -84,8 +91,213 @@ export default {
         this.user = response.data;
         this.roleGroup = response.roleGroup;
         this.postGroup = response.postGroup;
+        this.userInfo = [
+          {
+            label: '部门：',
+            icon: 'dept',
+            value: this.user.dept ? this.user.dept.deptName : ''
+          },
+          {
+            label: '职务：',
+            icon: 'dept',
+            value: this.postGroup
+          },
+          {
+            label: '联系电话：',
+            icon: 'phone',
+            value: this.user.phonenumber
+          },
+          {
+            label: '薪资岗级：',
+            icon: 'postSalary',
+            value: this.selectDictLabel(this.dict.type.sys_user_postlevel, this.user.postLevel) + this.selectDictLabel(this.dict.type.sys_user_salarylevel, this.user.salaryLevel)
+          },
+          {
+            label: '入职时间：',
+            icon: 'date',
+            value: this.parseTime(this.user.entryDate, '{y}-{m}')
+          },
+          {
+            label: '技术职称：',
+            icon: 'titles',
+            value: this.user.titles != null ? this.selectDictLabels(this.dict.type.sys_user_titles, this.user.titles, ',') : ''
+          },
+          {
+            label: '职称专业：',
+            icon: 'titles',
+            value: this.user.titleProfession
+          },
+          {
+            label: '职业资格：',
+            icon: 'certificate',
+            value: this.user.certificates != null ? this.selectDictLabels(this.dict.type.sys_user_certificates, this.user.certificates, ',') : ''
+          },
+          {
+            label: '工程师岗级：',
+            icon: 'engineer',
+            value: this.selectDictLabel(this.dict.type.sys_user_engineerlevel, this.user.engineerLevel)
+          },
+          {
+            label: '技工等级：',
+            icon: 'operator',
+            value: this.selectDictLabel(this.dict.type.sys_user_operatorlevel, this.user.operatorLevel)
+          },
+          {
+            label: '项目经理级别：',
+            icon: 'pmLevel',
+            value: this.selectDictLabel(this.dict.type.sys_user_pmlevel, this.user.pmLevel)
+          },
+          {
+            label: '身份证号码：',
+            icon: 'idCard',
+            value: this.user.idCard
+          },
+          {
+            label: '籍贯：',
+            icon: 'place',
+            value: this.user.nativePlace
+          },
+          {
+            label: '政治面貌：',
+            icon: 'politicalAffiliation',
+            value: this.selectDictLabels(this.dict.type.sys_user_political, this.user.politicalAffiliation, ',')
+          },
+          {
+            label: '民族：',
+            icon: 'flower',
+            value: this.user.ethnic
+          },
+          {
+            label: '最高学历毕业院校：',
+            icon: 'school',
+            value: this.user.graduateSchool
+          },
+          {
+            label: '最高学历专业：',
+            icon: 'major',
+            value: this.user.major
+          },
+          {
+            label: '最高学历：',
+            icon: 'degree',
+            value: this.selectDictLabel(this.dict.type.sys_user_degree, this.user.degree)
+          },
+          {
+            label: '初始学历毕业院校：',
+            icon: 'school',
+            value: this.user.initialSchool
+          },
+          {
+            label: '初始学历专业：',
+            icon: 'major',
+            value: this.user.initialMajor
+          },
+          {
+            label: '初始学历：',
+            icon: 'degree',
+            value: this.selectDictLabel(this.dict.type.sys_user_degree, this.user.initialDegree)
+          },
+          {
+            label: '合同签订：',
+            icon: 'contractSign',
+            value: this.parseTime(this.user.contractSign, '{y}-{m}-{d}')
+          },
+          {
+            label: '合同期满：',
+            icon: 'contractExpire',
+            value: this.parseTime(this.user.contractExpire, '{y}-{m}-{d}')
+          },
+          {
+            label: '家庭住址：',
+            icon: 'homePlace',
+            value: this.user.homePlace
+          },
+          {
+            label: '紧急联系方式：',
+            icon: 'user',
+            value: this.user.contact ? this.user.contact : '' + this.user.telephone ? this.user.telephone : ''
+          },
+          {
+            label: '备注：',
+            icon: 'log',
+            value: this.user.remark
+          },
+        ]
       });
-    }
+    },
+    getAgeByIdCard(idCard) {
+      //获取用户身份证号码
+      const userCard = idCard
+      //如果用户身份证号码为undefined则返回空
+      if (!userCard) {
+        return 0
+      }
+      // 获取出生日期
+      const yearBirth = userCard.substring(6, 10)
+      const monthBirth = userCard.substring(10, 12)
+      const dayBirth = userCard.substring(12, 14)
+      // 获取当前年月日并计算年龄
+      const myDate = new Date()
+      const monthNow = myDate.getMonth() + 1
+      const dayNow = myDate.getDate()
+      let age = myDate.getFullYear() - yearBirth
+
+      if (monthNow < monthBirth || (monthNow == monthBirth && dayNow < dayBirth)) {
+        age--
+      }
+      return age
+    },
   }
 };
 </script>
+
+<style lang="scss" scoped>
+.userInfo {
+  background-color: #fff;
+  height: 1000px;
+  padding: 5px;
+
+  .user-name {
+    font-size: 18px;
+    font-weight: bold;
+  }
+
+  .user-sex {
+    line-height: 30px;
+    font-size: 14px;
+    color: #797979;
+  }
+
+  .info-item {
+    line-height: 30px;
+    color: #5A5A5A;
+    font-size: 14px;
+    padding-left: 30px;
+    display: flex;
+    align-items: flex-start;
+
+    .info-icon {
+      font-size: 20px;
+      margin-right: 10px;
+      vertical-align: middle;
+    }
+
+    .item-label {
+      max-width: 156px;
+      display: flex;
+      align-items: center;
+      font-family: '微软雅黑';
+      font-weight: bold;
+      // text-align: right;
+      // display: inline-block;
+    }
+  }
+}
+
+.stateInfo {
+  background-color: #fff;
+  height: 1000px;
+  overflow-y: scroll;
+  padding: 10px 30px 0;
+}
+</style>

oa-ui/src/views/system/user/profile/userInfo.vue

@@ -1,12 +1,18 @@
+<!--
+ * @Author: wrh
+ * @Date: 2024-01-03 08:55:38
+ * @LastEditors: wrh
+ * @LastEditTime: 2026-02-27 11:34:24
+-->
 <template>
-  <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+  <el-form ref="form" :model="form" :rules="rules" label-width="100px">
     <el-form-item label="用户昵称" prop="nickName">
       <el-input v-model="form.nickName" maxlength="30" />
     </el-form-item> 
     <el-form-item label="手机号码" prop="phonenumber">
       <el-input v-model="form.phonenumber" maxlength="11" />
     </el-form-item>
-    <el-form-item label="邮箱" prop="email">
+    <!-- <el-form-item label="邮箱" prop="email">
       <el-input v-model="form.email" maxlength="50" />
     </el-form-item>
     <el-form-item label="性别">
@@ -14,6 +20,15 @@
         <el-radio label="0">男</el-radio>
         <el-radio label="1">女</el-radio>
       </el-radio-group>
+    </el-form-item> -->
+    <el-form-item label="家庭住址" prop="homePlace">
+      <el-input v-model="form.homePlace" maxlength="100" />
+    </el-form-item>
+    <el-form-item label="紧急联系人" prop="contact">
+      <el-input v-model="form.contact" maxlength="30" />
+    </el-form-item>
+    <el-form-item label="紧急联系电话" prop="telephone">
+      <el-input v-model="form.telephone" maxlength="11" />
     </el-form-item>
     <el-form-item>
       <el-button type="primary" size="mini" @click="submit">保存</el-button>
@@ -39,13 +54,22 @@ export default {
         nickName: [
           { required: true, message: "用户昵称不能为空", trigger: "blur" }
         ],
-        email: [
-          { required: true, message: "邮箱地址不能为空", trigger: "blur" },
-          {
-            type: "email",
-            message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
+        // email: [
+        //   { required: false, message: "邮箱地址不能为空", trigger: "blur" },
+        //   {
+        //     type: "email",
+        //     message: "请输入正确的邮箱地址",
+        //     trigger: ["blur", "change"]
+        //   }
+        // ],
+        homePlace: [
+          { required: true, message: "家庭住址不能为空", trigger: "blur" }
+        ],
+        contact: [
+          { required: true, message: "紧急联系人不能为空", trigger: "blur" }
+        ],
+        telephone: [
+          { required: true, message: "紧急联系电话不能为空", trigger: "blur" }
         ],
         phonenumber: [
           { required: true, message: "手机号码不能为空", trigger: "blur" },
@@ -62,7 +86,7 @@ export default {
     user: {
       handler(user) {
         if (user) {
-          this.form = { nickName: user.nickName, phonenumber: user.phonenumber, email: user.email, sex: user.sex };
+          this.form = { nickName: user.nickName, phonenumber: user.phonenumber, email: user.email, sex: user.sex, contact: user.contact, telephone: user.telephone, homePlace: user.homePlace };
         }
       },
       immediate: true