merge

src/api/project/task.ts

@@ -45,3 +45,23 @@ export const exportTaskApi = (params: any, filename: string) => {
 export const getTaskDetailApi = (params: any) => {
   return post(`${PREFIX}task/getTaskDetail`, params);
 };
+
+// 按工位、学科的仿真任务达成统计
+export const getTaskCompleteStatisticsApi = (params: any) => {
+  return post(`${PREFIX}task/getTaskCompleteStatistics`, params);
+};
+
+// 按工位、学科的仿真指标达成统计
+export const getPerformanceCompleteStatisticsApi = (params: any) => {
+  return post(`${PREFIX}task/getPerformanceCompleteStatistics`, params);
+};
+
+// 项目成员难度系数统计
+export const getUserDifficultyStatisticsApi = (params: any) => {
+  return post(`${PREFIX}task/getUserDifficultyStatistics`, params);
+};
+
+// 项目成员任务进度统计
+export const getUserTaskCompleteStatisticsApi = (params: any) => {
+  return post(`${PREFIX}task/getUserTaskCompleteStatistics`, params);
+};

src/views/competenceCenter/condition/components/taskPool.scss

@@ -91,8 +91,9 @@
   min-width: 535px;
 
   .el-select {
-    width: 180px;
+    width: 230px;
   }
+
 }
 
 .select-form {

src/views/competenceCenter/condition/components/taskPool.vue

@@ -38,6 +38,7 @@
                     :key="item.value"
                     :label="item.poolName"
                     :value="item"
+                    :title="item.poolName"
                   />
                 </el-select>
               </el-form-item>
@@ -148,6 +149,7 @@
                 :key="item.value"
                 :label="item.poolName"
                 :value="item"
+                :title="item.poolName"
               />
             </el-select>
           </el-form-item>

src/views/competenceCenter/knowledge/components/folderDetailModal.vue

@@ -6,6 +6,7 @@
     show-confirm-button
     :diaTitle="mode === 'add' ? $t('知识库.新增') : $t('知识库.编辑')"
     :confirm-closable="false"
+    :width="500"
     @show="onShowFun"
   >
     <template #default>

src/views/task/projectList/components/taskDialog.vue

@@ -222,7 +222,7 @@
       <div>
         <el-button @click="closeFun">取消</el-button>
         <el-button @click="prePageFun" v-if="props.dialogType === 'create'">上一步</el-button>
-        <el-button @click="addOrEditTaskFun">完成</el-button>
+        <el-button @click="addOrEditTaskFun" type="primary">{{ $t('通用.确定') }}</el-button>
       </div>
     </template>
   </Dialog>