Browse Source

专家库修改

yanghao 1 week ago
parent
commit
e2d5f4bec6
2 changed files with 21 additions and 19 deletions
  1. 19 17
      src/views/expert/list/index.vue
  2. 2 2
      src/views/researchProject/breakdown/index.vue

+ 19 - 17
src/views/expert/list/index.vue

@@ -207,6 +207,10 @@
                   <span class="summary-label">梯队</span>
                   <strong>{{ activeExpert.team || '-' }}</strong>
                 </div>
+                <div class="summary-item">
+                  <span class="summary-label">专业方向</span>
+                  <strong>{{ activeExpert.direction?.join('、') || '-' }}</strong>
+                </div>
                 <div class="summary-item">
                   <span class="summary-label">目前所在单位</span>
                   <strong>{{ activeExpert.company || '-' }}</strong>
@@ -423,12 +427,10 @@
               </el-select>
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
-            <el-form-item label="所属团队" prop="teamIds">
-              <div class="team-select-field">
-                <el-input :model-value="selectedTeamNames" placeholder="请选择所属团队" readonly />
-                <el-button type="primary" plain @click="openTeamDialog">选择团队</el-button>
-              </div>
+            <el-form-item label="职称" prop="professionalTitle">
+              <el-input v-model="formData.professionalTitle" placeholder="请输入职称" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -463,23 +465,21 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="历任岗位" prop="formerPost">
-              <el-input v-model="formData.formerPost" placeholder="请输入历任岗位" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="岗位" prop="jobTitle">
               <el-input v-model="formData.jobTitle" placeholder="请输入岗位" />
             </el-form-item>
           </el-col>
+        </el-row>
 
-          <el-col :span="12">
-            <el-form-item label="职称" prop="professionalTitle">
-              <el-input v-model="formData.professionalTitle" placeholder="请输入职称" />
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="历任岗位" prop="formerPost">
+              <el-input
+                type="textarea"
+                v-model="formData.formerPost"
+                placeholder="请输入历任岗位"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -761,6 +761,7 @@ type ExpertItem = {
   professionalTitle: string
   jobTitle: string
   formerPost: string
+  softwareSkillsLabel: string
   teamIds: number[]
   avatar: string
   birthday: number | null
@@ -914,6 +915,7 @@ const buildExpertProfile = (expert: ExpertItem, groupLabel?: string): ExpertProf
     name: expert.expertName,
     avatar: expert.avatar || '',
     role: rankLabels.join('、') || '专家',
+    softwareSkillsLabel: softwareSkillLabels || '暂无',
     team: groupLabel || getDictLabel(DICT_TYPE.RD_EXPERT_ECHELON, expert.echelon) || '未分组',
     company: getDeptName(expert.deptId) || '-',
     age: getExpertAge(expert.birthday),
@@ -1350,7 +1352,7 @@ onMounted(async () => {
   display: flex;
   width: max-content;
   gap: 14px;
-  animation: expert-carousel-scroll 32s linear infinite;
+  animation: expert-carousel-scroll 100s linear infinite;
 }
 
 .carousel-track:hover {

+ 2 - 2
src/views/researchProject/breakdown/index.vue

@@ -128,7 +128,7 @@
       >当前父任务:{{ parentTask.name }},最多可添加 {{ MAX_CHILDREN }} 个孙子任务(已添加
       {{ parentTask.children.length }} 个)</el-alert
     >
-    <el-form ref="taskFormRef" :model="taskForm" :rules="taskRules" label-width="92px">
+    <el-form ref="taskFormRef" :model="taskForm" :rules="taskRules" label-width="auto">
       <el-form-item label="任务名称" prop="name"
         ><el-input
           v-model="taskForm.name"
@@ -322,7 +322,7 @@ const openTaskForm = (task?: Task, editing = false) => {
   }
   editingTask.value = editing ? task : undefined
   parentTask.value = !editing && task ? task : undefined
-  taskDialogTitle.value = editing ? '编辑任务' : task ? '新增子任务' : '新增一级任务'
+  taskDialogTitle.value = editing ? '编辑任务' : task ? '新增子任务' : '新增一级任务'
   resetTaskForm(editing && task ? task : createTask(task ? 2 : 1))
   taskDialogVisible.value = true
 }