From 3a93955f57ed1eacd9b9f1acecbafa0a507c0bbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 25 Apr 2021 02:57:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                   | 2 ++
 src/views/xm/core/skill/skillMng.vue   | 4 ++--
 src/views/xm/core/xmTask/XmTaskMng.vue | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 4f610c54..89bf4d9a 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -48,6 +48,7 @@ service.interceptors.request.use(config => {
 service.interceptors.response.use(                                       
   response => {
 	if(response.data && response.data.tips && response.data.tips.msg == 'Full authentication is required to access this resource'){ 
+    Message.closeAll()
 		 Message.error('会话过期，请重新登陆')
 		 //response.data.tips.msg="会话过期，请重新登陆";
 		 store.dispatch('FedLogOut').then(() => { 
@@ -62,6 +63,7 @@ service.interceptors.response.use(
     	switch (error.response.status) {
 	        case 401:
 	            // 返回 401 清除token信息并跳转到登录页面
+              Message.closeAll()
 	        	 Message.error('会话过期，请重新登陆')
 				     store.dispatch('FedLogOut').then(() => { 
 		            router.replace({path: '/login'})
diff --git a/src/views/xm/core/skill/skillMng.vue b/src/views/xm/core/skill/skillMng.vue
index f74a38ec..c1486082 100644
--- a/src/views/xm/core/skill/skillMng.vue
+++ b/src/views/xm/core/skill/skillMng.vue
@@ -4,7 +4,7 @@
       <el-row>
         <el-col :span="10"> 
           <el-button type="primary" v-if="jump==true" @click="selectConfirm" icon="el-icon-finished">确认选择</el-button>
-          <el-button type="primary" @click="getAllHrSkill" v-loading="sectionLoading" icon="el-icon-search">查询</el-button>
+          <el-button  @click="getAllHrSkill" v-loading="sectionLoading" icon="el-icon-search">刷新标签</el-button>
         </el-col> 
         <el-col :span="14">
           <el-checkbox 
@@ -18,7 +18,7 @@
             placeholder="回车直接快速添加技能分类"
             @keyup.enter.native="addTagCategorySubmitMethod"
           ></el-input>
-          <el-button type="primary"  @click="addTagCategorySubmitMethod" icon="el-icon-finished">保持</el-button>
+          <el-button type="primary"  @click="addTagCategorySubmitMethod" icon="el-icon-finished">保存分类</el-button>
           <el-tooltip content="黄色表示已经有的技能">
             <span class="addTagSquare"></span>
           </el-tooltip>
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 284cbb12..42dfad95 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -316,14 +316,14 @@
 			<xm-skill-mng :visible="skillVisible" :task-id="currTaskId" :task-name="currTaskName"></xm-skill-mng>
 		</el-dialog> -->
 
-		<el-dialog  :title="'任务'+currTaskName+'的技能要求'" :visible.sync="skillVisible" width="600" append-to-body  :close-on-click-modal="false">
+		<el-dialog  :title="'任务'+currTaskName+'的技能要求'" :visible.sync="skillVisible" width="80%" append-to-body  :close-on-click-modal="false">
 			<skill-mng :task-skills="taskSkills" :jump="true" @select-confirm="onTaskSkillsSelected"></skill-mng>
 		</el-dialog>
-		<el-dialog  :title="'技能条件'" :visible.sync="showSkillSearchVisible" width="600" append-to-body  :close-on-click-modal="false">
+		<el-dialog  :title="'技能条件'" :visible.sync="showSkillSearchVisible" width="70%" append-to-body  :close-on-click-modal="false">
 			<skill-mng :task-skills="filters.skillTags" :jump="true" @select-confirm="onTaskSkillsSearchSelected"></skill-mng>
 		</el-dialog>
 		
-		<el-dialog  title="任务模板" :visible.sync="taskTemplateVisible" width="80%" append-to-body  :close-on-click-modal="false">
+		<el-dialog  title="任务模板" :visible.sync="taskTemplateVisible" width="70%" append-to-body  :close-on-click-modal="false">
 			<xm-task-template-mng :is-select="true" @select-confirm="onTaskTemplatesSelected"></xm-task-template-mng>
 		</el-dialog>